Skip to content

J
jiedao-app-operator-master
Commit 246adaf2 authored by huhaiqing's avatar huhaiqing
Browse files
Options

修改海运问题

parent 54ea51de
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 14 deletions
src/views/ecw/box/ladingBill/index.vue
View file @ 246adaf2
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-row style="margin-top:15px"> <el-row style="margin-top:15px">
<el-table :data="billData.list" border max-height="500px"> <el-table :data="billData.list" border max-height="500px">
<el-table-column :label="$t('序号')" type="index" align="center" width="50" /> <el-table-column :label="$t('序号')" align="center" width="50" prop="tidanNo" />
<el-table-column :label="$t('订单号')" align="center" prop="orderNo" /> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
<el-table-column :label="$t('货物信息')" align="center" prop=""> <el-table-column :label="$t('货物信息')" align="center" prop="">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/ecw/box/query.vue
View file @ 246adaf2
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</div> </div>
<el-table :data="sectionObj.sectionOrderList" style="width: 100%" border @selection-change="handleSelectionChange"> <el-table :data="sectionObj.sectionOrderList" style="width: 100%" border @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" :selectable="selectable"></el-table-column>> <el-table-column type="selection" width="50" :selectable="selectable"></el-table-column>>
<el-table-column type="index" align="center" :label="$t('序号')" width="50" /> <el-table-column align="center" :label="$t('序号')" width="50" prop="tidanNum" />
<el-table-column prop="orderNo" :label="$t('订单号')" align="center"> <el-table-column prop="orderNo" :label="$t('订单号')" align="center">
<template v-slot="scope"> <template v-slot="scope">
<a href="javascript:void(0)" @click="jumpOrderDetail(scope.row)">{{ scope.row.orderNo }}</a> <a href="javascript:void(0)" @click="jumpOrderDetail(scope.row)">{{ scope.row.orderNo }}</a>
......
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @ 246adaf2
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<!-- 表格 --> <!-- 表格 -->
<el-row class="table-content"> <el-row class="table-content">
<el-table :data="tableData.sectionOrderList" border max-height="500px"> <el-table :data="tableData.sectionOrderList" border max-height="500px">
<el-table-column :label="$t('序号')" type="index" align="center" width="50" /> <el-table-column :label="$t('序号')" align="center" width="50" prop="tidanNum" />
<el-table-column :label="$t('订单号')" align="center" prop="orderNo"> <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
......
src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue
View file @ 246adaf2
...@@ -83,11 +83,12 @@ ...@@ -83,11 +83,12 @@
<el-collapse-transition> <el-collapse-transition>
<div v-show="!item.fold"> <div v-show="!item.fold">
<el-table v-loading="loading" :data="item.boxOrderItemList" border> <el-table v-loading="loading" :data="item.boxOrderItemList" border>
<el-table-column :label="$t('序号')" type="index" align="center" width="50" /> <!-- <el-table-column :label="$t('序号')" type="index" align="center" width="50" /> -->
<el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" min-width="500" /> <el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" min-width="500" />
<el-table-column :label="$t('品牌')" align="center" prop="brandType" width="120"> <el-table-column :label="$t('品牌')" align="center" prop="brandType" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" /> <template v-if="scope.row.brandName">{{scope.row.brandName}}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.feeType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="num" width="120" /> <el-table-column :label="$t('箱数')" align="center" prop="num" width="120" />
...@@ -206,7 +207,7 @@ export default { ...@@ -206,7 +207,7 @@ export default {
} }
return { return {
...item, ...item,
title: this.$t('第{index}部分', {index: index + 1}), title: this.$t("第{index}部分", { index: index + 1 }),
}; };
}); });
...@@ -278,9 +279,13 @@ export default { ...@@ -278,9 +279,13 @@ export default {
}, },
/* 删除部分 */ /* 删除部分 */
deletePart() { deletePart() {
this.$confirm(this.$t("确认删除该部分及其已预装订单？"), this.$t("提示"), { this.$confirm(
this.$t("确认删除该部分及其已预装订单？"),
this.$t("提示"),
{
type: "warning", type: "warning",
}) }
)
.then((_) => { .then((_) => {
deleteSection(this.partData.id).then((res) => { deleteSection(this.partData.id).then((res) => {
serviceMsg(res, this).then(() => { serviceMsg(res, this).then(() => {
...@@ -308,7 +313,7 @@ export default { ...@@ -308,7 +313,7 @@ export default {
/* 获取城市 */ /* 获取城市 */
importCityName(id) { importCityName(id) {
var arr = this.$attrs.warehouseList.filter((item) => item.id == id); var arr = this.$attrs.warehouseList.filter((item) => item.id == id);
return arr.length > 0 ? this.$l(arr[0], 'title') : this.$t("无"); return arr.length > 0 ? this.$l(arr[0], "title") : this.$t("无");
}, },
/* 待预装订单分页 */ /* 待预装订单分页 */
pageChange(page) { pageChange(page) {
......
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
View file @ 246adaf2
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
<div v-show="!part.fold"> <div v-show="!part.fold">
<el-table v-loading="preLoading" border :data="part.sectionGoodsList" @select="(selection)=>checkboxSelect(selection, part)" @select-all="(selection)=>checkboxSelect(selection, part)"> <el-table v-loading="preLoading" border :data="part.sectionGoodsList" @select="(selection)=>checkboxSelect(selection, part)" @select-all="(selection)=>checkboxSelect(selection, part)">
<el-table-column type="selection" align="center" width="55" fixed="left" /> <el-table-column type="selection" align="center" width="55" fixed="left" />
<el-table-column :label="$t('序号')" align="center" prop="tidanNum" width="50" />
<el-table-column :label="$t('订单号')" align="center" prop="orderNo" width="120"> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
...@@ -235,7 +236,7 @@ ...@@ -235,7 +236,7 @@
</div> </div>
</el-row> </el-row>
<el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries"> <el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">
<el-table-column type="index" align="center" :label="$t('序号')" width="50" /> <!-- <el-table-column type="index" align="center" :label="$t('序号')" width="50" /> -->
<el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" /> <el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" />
<el-table-column :label="$t('备案')" align="center" prop="feeType"> <el-table-column :label="$t('备案')" align="center" prop="feeType">
<template slot-scope="{row}"> <template slot-scope="{row}">
......
src/views/ecw/box/shippingSea/nodePage/review.vue
View file @ 246adaf2
...@@ -54,7 +54,9 @@ export default { ...@@ -54,7 +54,9 @@ export default {
if (shipmentObj[voKey] && shipmentObj[voKey].approvalStatus !== 1) { if (shipmentObj[voKey] && shipmentObj[voKey].approvalStatus !== 1) {
this.isReview = false; this.isReview = false;
} }
if (shipmentObj[voKey]) {
this.bpmProcessId = shipmentObj[voKey].bpmProcessId; this.bpmProcessId = shipmentObj[voKey].bpmProcessId;
}
if (this.isReview) { if (this.isReview) {
this.$set( this.$set(
this.reviewObj, this.reviewObj,
......
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
View file @ 246adaf2
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<el-row style="margin-top: 5px"> <el-row style="margin-top: 5px">
<el-table border :data="tallyList" @select="checkboxSelect" @select-all="checkboxSelect" max-height="600px"> <el-table border :data="tallyList" @select="checkboxSelect" @select-all="checkboxSelect" max-height="600px">
<el-table-column type="selection" align="center" width="55" fixed="left" /> <el-table-column type="selection" align="center" width="55" fixed="left" />
<el-table-column type="index" align="center" :label="$t('序号')" width="50" /> <el-table-column align="center" :label="$t('序号')" width="50" prop="tidanNum" />
<el-table-column :label="$t('订单号')" align="center" prop="orderNo"> <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
......
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @ 246adaf2
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<!-- 表格 --> <!-- 表格 -->
<el-row class="table-area"> <el-row class="table-area">
<el-table v-loading="loading" :data="pageData.sectionOrderList" border max-height="500px"> <el-table v-loading="loading" :data="pageData.sectionOrderList" border max-height="500px">
<el-table-column :label="$t('序号')" type="index" align="center" width="50" /> <el-table-column :label="$t('序号')" align="center" width="50" prop="tidanNum" />
<el-table-column :label="$t('订单号')" align="center" prop="orderNo"> <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.orderNo }} {{ scope.row.orderNo }}
......
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