Skip to content

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

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

parents 818642cc 5cee6c6a
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 71 deletions
src/components/WorkFlow/index.vue
View file @ 2244a243
<template> <template>
<div> <div class="workflow">
<div class="mb-10"> <div class="mb-10">
<my-process-viewer <my-process-viewer
ref="processViewer" ref="processViewer"
...@@ -82,4 +82,9 @@ export default { ...@@ -82,4 +82,9 @@ export default {
} }
} }
</script> </script>
\ No newline at end of file <style lang="scss" scoped>
.workflow ::v-deep .my-process-designer{
height: auto;
}
</style>
\ No newline at end of file
src/views/ecw/box/ladingBill/previewBill.vue
View file @ 2244a243
...@@ -58,6 +58,7 @@ export default { ...@@ -58,6 +58,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .contentHtml { ::v-deep .contentHtml {
word-break: initial;
> table { > table {
width: 96% !important; width: 96% !important;
margin-left: 2%; margin-left: 2%;
......
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
View file @ 2244a243
...@@ -523,10 +523,9 @@ export default { ...@@ -523,10 +523,9 @@ export default {
const { const {
checkExamineStatus, checkExamineStatus,
checkDealStatus, checkDealStatus,
customsInfo = {}, customsInfo,
} = this.shipmentObj; } = this.shipmentObj;
const { dcCheckStatus } = customsInfo; const { dcCheckStatus } = customsInfo ?? {}; // 部分退场状态并且审核通过，退场不可选择
// 部分退场状态并且审核通过，退场不可选择
if ( if (
checkExamineStatus === 2 && checkExamineStatus === 2 &&
dcCheckStatus === 2 && dcCheckStatus === 2 &&
...@@ -565,11 +564,11 @@ export default { ...@@ -565,11 +564,11 @@ export default {
this.$set(this.cusDeclarationObj, "dcCheckStatus", ""); this.$set(this.cusDeclarationObj, "dcCheckStatus", "");
this.$set(this.cusDeclarationObj, "dcPassTime", ""); this.$set(this.cusDeclarationObj, "dcPassTime", "");
} else { } else {
const { customsInfo = {} } = this.shipmentObj; const { customsInfo } = this.shipmentObj;
this.$set( this.$set(
this.cusDeclarationObj, this.cusDeclarationObj,
"dcCheckStatus", "dcCheckStatus",
(customsInfo.dcCheckStatus && String(customsInfo.dcCheckStatus)) || (customsInfo?.dcCheckStatus && String(customsInfo?.dcCheckStatus)) ||
"3" "3"
); );
} }
...@@ -596,8 +595,8 @@ export default { ...@@ -596,8 +595,8 @@ export default {
}, },
// 查验状态 // 查验状态
"cusDeclarationObj.dcCheckStatus"(val) { "cusDeclarationObj.dcCheckStatus"(val) {
const { customsInfo = {} } = this.shipmentObj; const { customsInfo } = this.shipmentObj;
if (val != customsInfo.dcCheckStatus) { if (val != customsInfo?.dcCheckStatus) {
this.$set(this.cusDeclarationObj, "dcPassTime", ""); this.$set(this.cusDeclarationObj, "dcPassTime", "");
} }
}, },
...@@ -608,9 +607,9 @@ export default { ...@@ -608,9 +607,9 @@ export default {
const { const {
checkExamineStatus, checkExamineStatus,
checkDealStatus, checkDealStatus,
customsInfo = {}, customsInfo,
} = this.shipmentObj; } = this.shipmentObj;
const { dcCheckStatus } = customsInfo; const { dcCheckStatus } = customsInfo ?? {};
if (checkExamineStatus === 1) { if (checkExamineStatus === 1) {
return dcCheckStatus === 1 return dcCheckStatus === 1
? this.$t("退场审核中") ? this.$t("退场审核中")
...@@ -629,9 +628,9 @@ export default { ...@@ -629,9 +628,9 @@ export default {
const { const {
checkExamineStatus, checkExamineStatus,
checkDealStatus, checkDealStatus,
customsInfo = {}, customsInfo,
} = this.shipmentObj; } = this.shipmentObj;
const { dcCheckStatus } = customsInfo; const { dcCheckStatus } = customsInfo ?? {};
// 状态 // 状态
if (type === "status") { if (type === "status") {
......
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @ 2244a243
...@@ -303,7 +303,8 @@ export default { ...@@ -303,7 +303,8 @@ export default {
}); });
}, },
// 获取异常类型 // 获取异常类型
getUnloadError(exceptionList = []) { getUnloadError(exceptionList) {
if (!exceptionList) return exceptionList;
const codes = this.getDictDatas(this.DICT_TYPE.ORDER_ERROR_TYPE); const codes = this.getDictDatas(this.DICT_TYPE.ORDER_ERROR_TYPE);
let errorLabels = []; let errorLabels = [];
exceptionList.forEach((item) => { exceptionList.forEach((item) => {
......
src/views/ecw/coupon/index.vue
View file @ 2244a243
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题" prop="titleZh"> <!-- <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> -->
<!-- <el-form-item label="标题" prop="titleEn"> <!-- <el-form-item label="标题" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.titleEn" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> --> </el-form-item> -->
...@@ -14,7 +14,18 @@ ...@@ -14,7 +14,18 @@
<!-- <el-select v-model="queryParams.type" placeholder="请选择类型 1:优惠卷 2:金额-满减 3:方数-满减 4 折扣 5优惠 6 特价 7区间价" clearable size="small"> <!-- <el-select v-model="queryParams.type" placeholder="请选择类型 1:优惠卷 2:金额-满减 3:方数-满减 4 折扣 5优惠 6 特价 7区间价" clearable size="small">
<el-option label="请选择字典生成" value="" /> <el-option label="请选择字典生成" value="" />
</el-select> --> </el-select> -->
<dict-selector :type='DICT_TYPE.ECW_COUPON_TYPE' v-model="queryParams.type" /> <dict-selector :type='DICT_TYPE.ECW_COUPON_TYPE' v-model="queryParams.type" clearable />
</el-form-item>
<el-form-item label="状态" prop="status" clearable>
<!-- <dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/> -->
<el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
<el-option label="草稿" value="0" />
<el-option label="已发布" value="1" />
<el-option label="已过期" value="2" />
</el-select>
</el-form-item>
<el-form-item label="关键字" prop="conditionCurrencyId">
<el-input v-model="queryParams.searchKey" placeholder="请输入关键字" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="使用条件(优惠卷专用)" prop="cashCondition"> <!-- <el-form-item label="使用条件(优惠卷专用)" prop="cashCondition">
<el-input v-model="queryParams.cashCondition" placeholder="请输入使用条件(优惠卷专用)" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.cashCondition" placeholder="请输入使用条件(优惠卷专用)" clearable @keyup.enter.native="handleQuery"/>
...@@ -25,26 +36,26 @@ ...@@ -25,26 +36,26 @@
<el-form-item label="条件货币ID" prop="conditionCurrencyId"> <el-form-item label="条件货币ID" prop="conditionCurrencyId">
<el-input v-model="queryParams.conditionCurrencyId" placeholder="请输入条件货币ID" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.conditionCurrencyId" placeholder="请输入条件货币ID" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> --> </el-form-item> -->
<el-form-item label="开始时间"> <!-- <el-form-item label="开始时间">
<el-date-picker v-model="dateRangeStartTime" style="width: 240px" value-format="yyyy-MM-dd" <el-date-picker v-model="dateRangeStartTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" /> type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item> </el-form-item> -->
<!-- <el-form-item label="减免货币ID" prop="reduceCurrencyId"> <!-- <el-form-item label="减免货币ID" prop="reduceCurrencyId">
<el-input v-model="queryParams.reduceCurrencyId" placeholder="请输入减免货币ID" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.reduceCurrencyId" placeholder="请输入减免货币ID" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> --> </el-form-item> -->
<el-form-item label="结束时间"> <!-- <el-form-item label="结束时间">
<el-date-picker v-model="dateRangeEndTime" style="width: 240px" value-format="yyyy-MM-dd" <el-date-picker v-model="dateRangeEndTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" /> type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item> </el-form-item> -->
<!-- <el-form-item label="领券后X天起生效" prop="afterReceiveDays"> <!-- <el-form-item label="领券后X天起生效" prop="afterReceiveDays">
<el-input v-model="queryParams.afterReceiveDays" placeholder="请输入领券后X天起生效" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.afterReceiveDays" placeholder="请输入领券后X天起生效" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="有效天数" prop="validDays"> <el-form-item label="有效天数" prop="validDays">
<el-input v-model="queryParams.validDays" placeholder="请输入有效天数" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.validDays" placeholder="请输入有效天数" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> --> </el-form-item> -->
<el-form-item label="费用类型" prop="costType"> <!-- <el-form-item label="费用类型" prop="costType">
<dict-selector :type="DICT_TYPE.ECW_COUPON_COST_TYPE" v-model="queryParams.costType"/> <dict-selector :type="DICT_TYPE.ECW_COUPON_COST_TYPE" v-model="queryParams.costType"/>
</el-form-item> </el-form-item> -->
<!-- <el-form-item label="优惠清单" prop="discountDetailed"> <!-- <el-form-item label="优惠清单" prop="discountDetailed">
<el-input v-model="queryParams.discountDetailed" placeholder="请输入优惠清单" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.discountDetailed" placeholder="请输入优惠清单" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
...@@ -74,12 +85,12 @@ ...@@ -74,12 +85,12 @@
<el-form-item label="每个用户领券上限，如不填则默认为1" prop="limitNum"> <el-form-item label="每个用户领券上限，如不填则默认为1" prop="limitNum">
<el-input v-model="queryParams.limitNum" placeholder="请输入每个用户领券上限，如不填则默认为1" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.limitNum" placeholder="请输入每个用户领券上限，如不填则默认为1" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> --> </el-form-item> -->
<el-form-item label="过期状态" prop="overdueStatus"> <!-- <el-form-item label="过期状态" prop="overdueStatus">
<dict-selector :type="DICT_TYPE.ECW_COUPON_OVERDUE_STATUS" v-model="queryParams.overdueStatus"/> <dict-selector :type="DICT_TYPE.ECW_COUPON_OVERDUE_STATUS" v-model="queryParams.overdueStatus"/>
</el-form-item> </el-form-item> -->
<el-form-item label="投放状态" prop="putonStatus"> <!-- <el-form-item label="投放状态" prop="putonStatus">
<dict-selector :type="DICT_TYPE.ECW_COUPON_PUTON_STATUS" v-model="queryParams.putonStatus"/> <dict-selector :type="DICT_TYPE.ECW_COUPON_PUTON_STATUS" v-model="queryParams.putonStatus"/>
</el-form-item> </el-form-item> -->
<!-- <el-form-item label="获取方式 0=客户领取 1=平台发放" prop="getWay"> <!-- <el-form-item label="获取方式 0=客户领取 1=平台发放" prop="getWay">
<el-input v-model="queryParams.getWay" placeholder="请输入获取方式 0=客户领取 1=平台发放" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.getWay" placeholder="请输入获取方式 0=客户领取 1=平台发放" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
...@@ -97,9 +108,7 @@ ...@@ -97,9 +108,7 @@
<el-form-item label="单证报关(可多选) 1 我司全代 2自单代报 3混合报关" prop="documentDeclaration"> <el-form-item label="单证报关(可多选) 1 我司全代 2自单代报 3混合报关" prop="documentDeclaration">
<el-input v-model="queryParams.documentDeclaration" placeholder="请输入单证报关(可多选) 1 我司全代 2自单代报 3混合报关" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.documentDeclaration" placeholder="请输入单证报关(可多选) 1 我司全代 2自单代报 3混合报关" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> --> </el-form-item> -->
<el-form-item label="状态" prop="status">
<dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/>
</el-form-item>
<!-- <el-form-item label="创建时间"> <!-- <el-form-item label="创建时间">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" /> type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
...@@ -132,28 +141,34 @@ ...@@ -132,28 +141,34 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标题" align="center" prop="titleZh" /> <el-table-column label="标题" align="center" prop="titleZh" />
<!-- <el-table-column label="描述" align="center" prop="type">
<template slot-scope="{row}">
{{$l(row, 'content')}}
</template>
</el-table-column> -->
<el-table-column label="发布人/发布时间" align="center" prop="startTime" width="180"> <el-table-column label="发布人/发布时间" align="center" prop="startTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.creatorName }}</div> <div>{{ scope.row.creatorName }}</div>
<div>{{ parseTime(scope.row.createTime) }}</div> <div>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="开始时间" align="center" prop="startTime" width="180"> <el-table-column label="开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime) }}</span> <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结束时间" align="center" prop="endTime" width="180"> <el-table-column label="结束时间" align="center" prop="endTime" width="180">
<template slot-scope="scope"> <template slot-scope="{row}">
<span>{{ parseTime(scope.row.endTime) }}</span> <div :style="{red: row.overdueStatus ==0 ? 'red' : null}">{{ parseTime(row.endTime, '{y}-{m}-{d}') }}</div>
<div v-if="row.overdueStatus == 0" style="color: red">已过期</div>
</template> </template>
</el-table-column> </el-table-column>
<!--
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column-->
<el-table-column label="状态" align="center" prop="createTime" width="180"> <el-table-column label="状态" align="center" prop="createTime" width="180">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_IS_DRAFT" :value="row.status" /> <dict-tag :type="DICT_TYPE.ECW_IS_DRAFT" :value="row.status" />
...@@ -251,6 +266,10 @@ export default { ...@@ -251,6 +266,10 @@ export default {
this.loading = true; this.loading = true;
// 处理查询参数 // 处理查询参数
let params = {...this.queryParams}; let params = {...this.queryParams};
if(params.status == 2){
params.overdueStatus=0
params.status = null
}
this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime'); this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime'); this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
......
src/views/ecw/customer/edit.vue
View file @ 2244a243
...@@ -537,7 +537,6 @@ export default { ...@@ -537,7 +537,6 @@ export default {
source: [{ required: true, message: this.$t('客户来源不能为空'), trigger: "blur" }], source: [{ required: true, message: this.$t('客户来源不能为空'), trigger: "blur" }],
customerService: [{ required: true, message: this.$t('客户经理不能为空'), trigger: "blur" }], customerService: [{ required: true, message: this.$t('客户经理不能为空'), trigger: "blur" }],
status: [{ required: true, message: this.$t('客户状态不能为空'), trigger: "blur" }], status: [{ required: true, message: this.$t('客户状态不能为空'), trigger: "blur" }],
founder: [{ required: true, message: this.$t('创建人不能为空'), trigger: "blur" }],
}, },
...@@ -672,7 +671,10 @@ export default { ...@@ -672,7 +671,10 @@ export default {
if(errors){ if(errors){
return this.$message.error('有两条路线未选择目的地') return this.$message.error('有两条路线未选择目的地')
} }
//我的客户页面跳转直接，完善客户
if(this.isCustomerServiceConfirmed){
form.isCustomerServiceConfirmed = this.isCustomerServiceConfirmed;
}
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
this.form.customerContacts.forEach(e => { this.form.customerContacts.forEach(e => {
...@@ -698,10 +700,6 @@ export default { ...@@ -698,10 +700,6 @@ export default {
return; return;
} }
// 添加的提交 // 添加的提交
//我的客户页面跳转直接
if(this.isCustomerServiceConfirmed){
form.isCustomerServiceConfirmed = this.isCustomerServiceConfirmed;
}
createCustomer(form).then(response => { createCustomer(form).then(response => {
this.$modal.msgSuccess(this.$t('新增成功')); this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false; this.open = false;
......
src/views/ecw/customer/index.vue
View file @ 2244a243
...@@ -113,8 +113,8 @@ ...@@ -113,8 +113,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('入公海时间')" align="center" prop="createTime" width="180"> <el-table-column :label="$t('入公海时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template v-slot = {row}>
<span>{{ parseTime(scope.row.enterOpenSeaTime) }}</span> <span>{{ parseTime(row.enterOpenSeaTime ? row.enterOpenSeaTime : row.estimateEnterOpenSeaTime ) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName"> <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
......
src/views/ecw/customerConfirm/index.vue
View file @ 2244a243
...@@ -513,7 +513,7 @@ export default { ...@@ -513,7 +513,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id; const id = row.id;
this.$router.push('/customer/perfect/'+id); this.$router.push({path:'/customer/perfect/'+id,query:{isCustomerServiceConfirmed:true,}});
// getCustomer(id).then(response => { // getCustomer(id).then(response => {
// this.form = response.data; // this.form = response.data;
// this.open = true; // this.open = true;
......
src/views/ecw/oceanCustomer/index.vue
View file @ 2244a243
...@@ -104,6 +104,11 @@ ...@@ -104,6 +104,11 @@
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('入公海时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.enterOpenSeaTime) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName" > <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName" >
</el-table-column> </el-table-column>
<el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column> <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
......
src/views/ecw/order/detail.vue
View file @ 2244a243
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
<el-tab-pane :label="$t('运单资料/提货单')" name="three"> <el-tab-pane :label="$t('运单资料/提货单')" name="three">
<!--inWarehouseState 1待入库，2多了，3少了，4到齐--> <!--inWarehouseState 1待入库，2多了，3少了，4到齐-->
<el-button type="text" @click="showWarehouseReceipt=true" :disabled="order.inWarehouseState <= 1">{{$t('查看入仓单')}}</el-button> <el-button type="text" @click="showWarehouseReceipt=true" :disabled="order.inWarehouseState <= 1">{{$t('查看入仓单')}}</el-button>
<el-button type="text" @click.native="showLadingBill=true" :disabled="!order.tidanNo">{{$t('查看提货单')}}</el-button> <el-button type="text" @click.native="showLadingBill=true" :disabled="!order.ladingState">{{$t('查看提货单')}}</el-button>
<el-button :disabled="!order.packingListUrl" type="text" @click="downloadPackingList">{{$t('装箱单')}}</el-button> <el-button :disabled="!order.packingListUrl" type="text" @click="downloadPackingList">{{$t('装箱单')}}</el-button>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('费用明细')" name="four"> <el-tab-pane :label="$t('费用明细')" name="four">
......
src/views/ecw/order/index.vue
View file @ 2244a243
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type"> <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
<span>{{ scope.row.orderNo }}</span> <span>{{ scope.row.orderNo }}</span>
</router-link> </router-link>
<div style="display: flex;flex-wrap: wrap;"> <div style="display: flex;flex-wrap: wrap;" v-if="scope.row.advanceType">
<el-button @click="deleteSpecial(item.value,scope.row.orderId)" size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.label[0]}}</el-button> <el-button @click="deleteSpecial(item.value,scope.row.orderId)" size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.label[0]}}</el-button>
</div> </div>
</template> </template>
......
src/views/ecw/order/warehousing/components/editDialog.vue
View file @ 2244a243
...@@ -248,6 +248,7 @@ ...@@ -248,6 +248,7 @@
<el-input v-else v-model="tableData1[$index].cartonsNum" placeholder=""> <el-input v-else v-model="tableData1[$index].cartonsNum" placeholder="">
<span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData1[$index].unit) }}</span> <span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData1[$index].unit) }}</span>
</el-input> </el-input>
<dict-selector :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="tableData1[$index].specificationType" @change="handleVolume($index)"></dict-selector>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -266,7 +267,7 @@ ...@@ -266,7 +267,7 @@
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge1" :prop="$index + '.boxGauge1'"> <el-form-item :rules="tableFormRules.boxGauge1" :prop="$index + '.boxGauge1'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[0] : '' }}</span> <span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[0] : '' }}</span>
<el-input v-else v-model.number="tableData1[$index].boxGauge1" placeholder="" @blur="handleVolume($index, 1)"></el-input> <el-input v-else type="number" v-model="tableData1[$index].boxGauge1" placeholder="" @blur="handleVolume($index, 1)"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -274,7 +275,7 @@ ...@@ -274,7 +275,7 @@
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge2" :prop="$index + '.boxGauge2'"> <el-form-item :rules="tableFormRules.boxGauge2" :prop="$index + '.boxGauge2'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[1] : '' }}</span> <span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[1] : '' }}</span>
<el-input v-else v-model.number="tableData1[$index].boxGauge2" placeholder="" @blur="handleVolume($index, 1)"></el-input> <el-input v-else type="number" v-model="tableData1[$index].boxGauge2" placeholder="" @blur="handleVolume($index, 1)"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -282,7 +283,7 @@ ...@@ -282,7 +283,7 @@
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge3" :prop="$index + '.boxGauge3'"> <el-form-item :rules="tableFormRules.boxGauge3" :prop="$index + '.boxGauge3'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[2] : '' }}</span> <span v-if="tableData1[$index].id">{{ tableData1[$index].boxGauge ? tableData1[$index].boxGauge.split('*')[2] : '' }}</span>
<el-input v-else v-model.number="tableData1[$index].boxGauge3" placeholder="" @blur="handleVolume($index, 1)"></el-input> <el-input v-else type="number" v-model="tableData1[$index].boxGauge3" placeholder="" @blur="handleVolume($index, 1)"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -293,7 +294,7 @@ ...@@ -293,7 +294,7 @@
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'"> <el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].volume }}</span> <span v-if="tableData1[$index].id">{{ tableData1[$index].volume }}</span>
<el-input v-else v-model.number="tableData1[$index].volume" placeholder=""></el-input> <el-input v-else type="number" v-model="tableData1[$index].volume" placeholder=""></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -304,14 +305,11 @@ ...@@ -304,14 +305,11 @@
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'"> <el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].weight }}</span> <span v-if="tableData1[$index].id">{{ tableData1[$index].weight }}</span>
<el-input v-else v-model.number="tableData1[$index].weight" placeholder=""></el-input> <el-input v-else type="number" v-model="tableData1[$index].weight" placeholder=""></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" width="130px"> <el-table-column label="数量" width="130px">
<template v-slot:header>
<span style="color: red">*</span> 数量
</template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.quantityAll" :prop="$index + '.quantityAll'"> <el-form-item :rules="tableFormRules.quantityAll" :prop="$index + '.quantityAll'">
<span v-if="tableData1[$index].id">{{ tableData1[$index].quantityAll }}</span> <span v-if="tableData1[$index].id">{{ tableData1[$index].quantityAll }}</span>
......
src/views/ecw/order/warehousing/index.vue
View file @ 2244a243
...@@ -81,12 +81,12 @@ ...@@ -81,12 +81,12 @@
prop="address" prop="address"
:label="$t('操作')"> :label="$t('操作')">
<template v-slot="{ row, column, $index }"> <template v-slot="{ row, column, $index }">
<el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing($index)">{{$t('修改')}}</el-button> <el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing(row)">{{$t('修改')}}</el-button>
<template v-else-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0"> <template v-else-if="wareItem(row.orderItemId) && wareItem(row.orderItemId).orderWarehouseInBackItemDoList && wareItem(row.orderItemId).orderWarehouseInBackItemDoList.length > 0">
<el-button size="mini" type="text" @click="handleWarehousing($index)">{{$t('追加')}}</el-button> <el-button size="mini" type="text" @click="handleWarehousing(row)">{{$t('追加')}}</el-button>
<el-button size="mini" type="text" @click="handleWarehousingReturn(row)">{{$t('退仓')}}</el-button> <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">{{$t('退仓')}}</el-button>
</template> </template>
<el-button v-else size="mini" type="text" @click="handleWarehousing($index)">{{$t('入仓')}}</el-button> <el-button v-else size="mini" type="text" @click="handleWarehousing(row)">{{$t('入仓')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -379,8 +379,9 @@ export default { ...@@ -379,8 +379,9 @@ export default {
} }
}) })
}, },
handleWarehousing(index) { handleWarehousing(row) {
this.warehousing = {...this.order.orderItemVOList[index], ...this.orderItemList[index]} let wareItem = this.orderItemList.find(item => item.orderItemId == row.orderItemId) || {}
this.warehousing = {...row, ...wareItem}
this.warehousingVisible = true this.warehousingVisible = true
}, },
handleWarehousingReturn(item){ handleWarehousingReturn(item){
...@@ -426,6 +427,12 @@ export default { ...@@ -426,6 +427,12 @@ export default {
}, },
computed: { computed: {
// 根据orderItemId获取入仓item
wareItem(){
return orderItemId => {
return this.orderItemList.find(item => item.orderItemId == orderItemId)
}
},
// isAdd() { // isAdd() {
// return this.$route.path === "/order/warehousing-add" // return this.$route.path === "/order/warehousing-add"
// }, // },
......
src/views/ecw/productPrice/edit.vue
View file @ 2244a243
...@@ -154,10 +154,10 @@ ...@@ -154,10 +154,10 @@
:prop="`specialList.${specialIndex}`.allPrice" :prop="`specialList.${specialIndex}`.allPrice"
:rules="{validator: priceValidator, trigger: 'blur', message: '价格错误'}" :rules="{validator: priceValidator, trigger: 'blur', message: '价格错误'}"
> >
<selector v-model="special.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" /> <selector disabled v-model="special.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
<inputor default2="0" v-model.number="special.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="special.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span> <span class="mr-10">/</span>
<selector v-model="special.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" /> <selector disabled v-model="special.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
</template> </template>
<template v-else v-for="(special, specialIndex) in this.form.specialList"> <template v-else v-for="(special, specialIndex) in this.form.specialList">
...@@ -167,10 +167,10 @@ ...@@ -167,10 +167,10 @@
:prop="`specialList.${specialIndex}.transportPrice`" :prop="`specialList.${specialIndex}.transportPrice`"
:rules="{validator: priceValidator, trigger: 'blur', message: '价格错误'}" :rules="{validator: priceValidator, trigger: 'blur', message: '价格错误'}"
> >
<selector v-model="special.transportPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" /> <selector disabled v-model="special.transportPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
<inputor default2="0" v-model.number="special.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="special.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span> <span class="mr-10">/</span>
<selector v-model="special.transportVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" /> <selector disabled v-model="special.transportVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('清关费')" :label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('清关费')"
...@@ -178,10 +178,10 @@ ...@@ -178,10 +178,10 @@
:prop="`specialList.${specialIndex}.clearancePrice`" :prop="`specialList.${specialIndex}.clearancePrice`"
:rules="{validator: priceValidator, trigger: 'blur', message: '价格错误'}" :rules="{validator: priceValidator, trigger: 'blur', message: '价格错误'}"
> >
<selector v-model="special.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" /> <selector disabled v-model="special.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
<inputor default2="0" v-model.number="special.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="special.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span> <span class="mr-10">/</span>
<selector v-model="special.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" /> <selector disabled v-model="special.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
</template> </template>
</template> </template>
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
<el-button @click="showLogsDialog=true" type="primary" v-if="readonly">{{$t('查看价格日志')}}</el-button> <el-button @click="showLogsDialog=true" type="primary" v-if="readonly">{{$t('查看价格日志')}}</el-button>
</div> </div>
<el-dialog title="查看价格日志" :visible="showLogsDialog" :before-close="closeLogsDialog" width="1000px"> <el-dialog :title="$t('查看价格日志')" :visible="showLogsDialog" :before-close="closeLogsDialog" width="1000px">
<el-table :data="logs"> <el-table :data="logs">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="修改人" prop="creatorName"></el-table-column> <el-table-column label="修改人" prop="creatorName"></el-table-column>
......
src/views/member/user/index.vue
View file @ 2244a243
...@@ -585,13 +585,13 @@ export default { ...@@ -585,13 +585,13 @@ export default {
}) })
}, },
authentication(row){ authentication(row){
if(!row.identityAuditStatus && !row.enterpriseAuditRemark){ if(!row.identityAuditStatus && !row.enterpriseAuditStatus){
return this.$t('否') return this.$t('否')
}else if(row.identityAuditStatus >= 0 && row.enterpriseAuditRemark >= 0){ }else if(!!row.identityAuditStatus && !!row.enterpriseAuditStatus){
return this.$t('双认证') return this.$t('双认证')
} else if(row.identityAuditStatus >= 0){ } else if(row.identityAuditStatus >= 0){
return this.$t('身份') return this.$t('身份')
}else if(row.enterpriseAuditRemark >= 0){ }else if(row.enterpriseAuditStatus >= 0){
return this.$t('营业') return this.$t('营业')
} }
}, },
......
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