Skip to content

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

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

parents a3f7c9d3 13fecbad
Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 44 deletions
src/views/bpm/processInstance/detail.vue
View file @ b153d7d0
...@@ -424,7 +424,14 @@ export default { ...@@ -424,7 +424,14 @@ export default {
}, },
// 出货审核 // 出货审核
air_shipment: { air_shipment: {
component: "shippingDetail",
processId: this.processInstance.businessKey,
type: 'shipment'
},
//排单分拣审核
shipment_order_sorting: {
component: "shippingDetail",
processId: this.processInstance.businessKey
} }
} }
console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim()) console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim())
......
src/views/ecw/box/indexAir.vue
View file @ b153d7d0
...@@ -506,12 +506,13 @@ export default { ...@@ -506,12 +506,13 @@ export default {
this.$router.push('/boxAir/batch_markup?shipmentId=' + row.id) this.$router.push('/boxAir/batch_markup?shipmentId=' + row.id)
break break
case "downloadPreloadGoodsList": case "downloadPreloadGoodsList":
downloadFile( // downloadFile(
command, // command,
{shipmentId: row.id}, // {shipmentId: row.id},
this.$t("预装单") + `(${row.selfNo}).xlsx`, // this.$t("预装单") + `(${row.selfNo}).xlsx`,
"xlsx" // "xlsx"
); // );
this.exportExcel(exportboxExcel, { shipmentId: row.id }, this.$t("预装单") + `(${row.selfNo}).xlsx`)
break; break;
case "downloadLoadGoodsList": case "downloadLoadGoodsList":
downloadFile( downloadFile(
...@@ -563,6 +564,20 @@ export default { ...@@ -563,6 +564,20 @@ export default {
this.$set(this.dialogCfg, "open", true); this.$set(this.dialogCfg, "open", true);
} }
}, },
// 通用导出函数
exportExcel(func, params, fileName = null){
this.exportLoading = true;
func(params).then(res => {
console.log({res})
if(!fileName){
fileName = this.$t('订单')
}
this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
// this.$download.excel(res, fileName + '.xls');
}).finally(() => {
this.exportLoading = false
})
},
} }
} }
......
src/views/ecw/box/indexSea.vue
View file @ b153d7d0
...@@ -287,7 +287,7 @@ export default { ...@@ -287,7 +287,7 @@ export default {
countryList: [], countryList: [],
// 通知列表 // 通知列表
noticeList: [], noticeList: [],
allUsers: [], allUsers: []
}; };
}, },
computed: { computed: {
...@@ -489,12 +489,13 @@ export default { ...@@ -489,12 +489,13 @@ export default {
break; break;
case "downloadPreloadGoodsList": case "downloadPreloadGoodsList":
downloadFile( // downloadFile(
command, // command,
{ shipmentId: row.id }, // { shipmentId: row.id },
this.$t("预装单") + `(${row.selfNo}).xlsx`, // this.$t("预装单") + `(${row.selfNo}).xlsx`,
"xlsx" // "xlsx"
); // );
this.exportExcel(exportboxExcel, { shipmentId: row.id }, this.$t("预装单") + `(${row.selfNo}).xlsx`)
break; break;
case "downloadLoadGoodsList": case "downloadLoadGoodsList":
downloadFile( downloadFile(
...@@ -547,6 +548,20 @@ export default { ...@@ -547,6 +548,20 @@ export default {
this.$set(this.dialogCfg, "open", true); this.$set(this.dialogCfg, "open", true);
} }
}, },
// 通用导出函数
exportExcel(func, params, fileName = null){
this.exportLoading = true;
func(params).then(res => {
console.log({res})
if(!fileName){
fileName = this.$t('订单')
}
this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
// this.$download.excel(res, fileName + '.xls');
}).finally(() => {
this.exportLoading = false
})
},
/* 分页 */ /* 分页 */
pageChange(page) { pageChange(page) {
this.pageParam.page = page; this.pageParam.page = page;
......
src/views/ecw/box/shippingAir/nodePage/cusDeclaration.vue
View file @ b153d7d0
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusDeclarationObj.dcDecTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusDeclarationObj.dcDecTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('状态')" prop="dcCustomsStatus"> <el-form-item :label="$t('状态')" prop="dcCustomsStatus">
<el-radio-group v-model="cusDeclarationObj.dcCustomsStatus" :disabled="inReview || isCheckDeal('status')"> <el-radio-group v-model="cusDeclarationObj.dcCustomsStatus" :disabled="inReview || inOverReview || isCheckDeal('status')">
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_DCCUSTOMS_STATUS)" :key="item.value" :label="item.value">{{$l(item, 'label')}}</el-radio> <el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_DCCUSTOMS_STATUS)" :key="item.value" :label="item.value">{{$l(item, 'label')}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<!-- 查验 --> <!-- 查验 -->
<div v-show="cusDeclarationObj.dcCustomsStatus === '3'"> <div v-show="cusDeclarationObj.dcCustomsStatus === '3'">
<el-form-item :label="$t('查验')"> <el-form-item :label="$t('查验')">
<el-radio-group v-model="cusDeclarationObj.dcCheckStatus" :disabled="inReview || isCheckDeal('check')"> <el-radio-group v-model="cusDeclarationObj.dcCheckStatus" :disabled="inReview || inOverReview || isCheckDeal('check')">
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CHECK_STATUS)" :key="item.value" :label="item.value" :disabled="disabledRadio(item)">{{$l(item, 'label')}}</el-radio> <el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CHECK_STATUS)" :key="item.value" :label="item.value" :disabled="disabledRadio(item)">{{$l(item, 'label')}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
...@@ -53,20 +53,20 @@ ...@@ -53,20 +53,20 @@
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusDeclarationObj.dcPassTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusDeclarationObj.dcPassTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('过机状态')" prop="overMachineStatus"> <el-form-item :label="$t('过机状态')" v-show="cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCheckStatus === '3'" prop="overMachineStatus">
<el-radio-group v-model="cusDeclarationObj.overMachineStatus" :disabled="inReview"> <el-radio-group v-model="cusDeclarationObj.overMachineStatus" :disabled="inReview||inOverReview">
<el-radio :label="1">{{$t('顺利')}}</el-radio> <el-radio :label="1">{{$t('顺利')}}</el-radio>
<el-radio :label="2">{{$t('异常')}}</el-radio> <el-radio :label="2">{{$t('异常')}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item prop="overMachineAbnormalStatus" v-show="cusDeclarationObj.overMachineStatus == 2"> <el-form-item prop="overMachineAbnormalStatus" v-show="cusDeclarationObj.overMachineStatus == 2">
<el-radio-group v-model="cusDeclarationObj.overMachineAbnormalStatus" :disabled="inReview"> <el-radio-group v-model="cusDeclarationObj.overMachineAbnormalStatus" :disabled="inReview||inOverReview">
<el-radio :label="1">{{$t('敏感货')}}</el-radio> <el-radio :label="1">{{$t('敏感货')}}</el-radio>
<el-radio :label="2">{{$t('重量误报')}}</el-radio> <el-radio :label="2">{{$t('重量误报')}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1" :label="$t('删单退场类型')"> <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1" :label="$t('删单退场类型')">
<el-radio-group v-model="cusDeclarationObj.deleteExitType" :disabled="inReview"> <el-radio-group v-model="cusDeclarationObj.deleteExitType" :disabled="inReview||inOverReview">
<el-radio :label="1">{{$t('退场时间')}}</el-radio> <el-radio :label="1">{{$t('退场时间')}}</el-radio>
<el-radio :label="2">{{$t('返回仓库')}}</el-radio> <el-radio :label="2">{{$t('返回仓库')}}</el-radio>
</el-radio-group> </el-radio-group>
...@@ -76,14 +76,14 @@ ...@@ -76,14 +76,14 @@
</el-form-item> </el-form-item>
<el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1"> <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1">
<el-form-item :label="$t('删单退场状态')"> <el-form-item :label="$t('删单退场状态')">
{{getCheckExamineStatus}} {{getOverExamineStatus}}
</el-form-item> </el-form-item>
</el-form-item> </el-form-item>
<el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1 && shipmentObj.overMachineExamineStatus == 0 && (typeof cusDeclarationObj.id != 'undefined')"> <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1 && shipmentObj.overMachineExamineStatus == 0 && (typeof cusDeclarationObj.id != 'undefined')">
<el-button type="primary" @click="approvalCreate">{{$t('提交删单退场审核')}}</el-button> <el-button type="primary" @click="approvalCreate">{{$t('提交删单退场审核')}}</el-button>
</el-form-item> </el-form-item>
<el-form-item prop="weightMisreport" v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 2"> <el-form-item prop="weightMisreport" v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 2">
<el-radio-group v-model="cusDeclarationObj.weightMisreport" :disabled="inReview"> <el-radio-group v-model="cusDeclarationObj.weightMisreport" :disabled="inOverReview">
<el-radio :label="1">{{$t('机场误差3%')}}</el-radio> <el-radio :label="1">{{$t('机场误差3%')}}</el-radio>
<el-radio :label="2">{{$t('超过误差10KG')}}</el-radio> <el-radio :label="2">{{$t('超过误差10KG')}}</el-radio>
<el-radio :label="3">{{$t('过机放行-未找到重货订单')}}</el-radio> <el-radio :label="3">{{$t('过机放行-未找到重货订单')}}</el-radio>
...@@ -115,10 +115,14 @@ ...@@ -115,10 +115,14 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button" v-if="inReview">
<el-button type="primary" @click="jumpReviewDetail">{{cusDeclarationObj.dcCheckStatus === '1' ? $t('全部退场审核中') : $t('部分退场审核中')}}</el-button>
<el-button type="primary" plain @click="canclAudit">{{cusDeclarationObj.dcCheckStatus === '1' ? $t('取消全部退场审核') : $t('取消部分退场审核')}}</el-button>
</el-row>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" v-if="inReview" plain @click="canclAudit">{{$t('取消删单退场审核')}}</el-button> <el-button type="primary" v-if="inOverReview" plain @click="canclOverAudit">{{$t('取消删单退场审核')}}</el-button>
<el-button type="primary" @click="onSubmit(1)" :disabled="isCheckDeal('submit')">{{$t('保存')}}</el-button> <el-button type="primary" @click="onSubmit(1)" :disabled="isCheckDeal('submit')">{{$t('保存')}}</el-button>
<el-button type="success" v-if="!inReview" @click="onSubmit(2)" :disabled="isCheckDeal('submit')">{{$t('提交')}}</el-button> <el-button type="success" v-if="!inReview&&!inOverReview" @click="onSubmit(2)" :disabled="isCheckDeal('submit')">{{$t('提交')}}</el-button>
<el-button @click="cancel">{{$t('关闭')}}</el-button> <el-button @click="cancel">{{$t('关闭')}}</el-button>
<el-button type="primary" @click="extraCost" v-show="cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCustomsStatus === '3'">{{$t('额外费用')}}</el-button> <el-button type="primary" @click="extraCost" v-show="cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCustomsStatus === '3'">{{$t('额外费用')}}</el-button>
<!-- <el-button type="primary" @click="exceptionReg" :disabled="!isShowError">{{$t('异常登记')}}</el-button> --> <!-- <el-button type="primary" @click="exceptionReg" :disabled="!isShowError">{{$t('异常登记')}}</el-button> -->
...@@ -259,6 +263,7 @@ export default { ...@@ -259,6 +263,7 @@ export default {
costList: [], costList: [],
// 是否审核中 // 是否审核中
inReview: false, inReview: false,
inOverReview: false,
// 异常登记 // 异常登记
regDialogVisible: false, regDialogVisible: false,
isShowError: false, isShowError: false,
...@@ -582,8 +587,23 @@ export default { ...@@ -582,8 +587,23 @@ export default {
toReviewDetail.apply(this, [customsApprovalInfo.bpmProcessId]); toReviewDetail.apply(this, [customsApprovalInfo.bpmProcessId]);
this.cancel("close"); this.cancel("close");
}, },
/* 取消审核 */ /* 取消退场审核 */
canclAudit() { canclAudit() {
console.log(this.shipmentObj)
approvalCancel({
applyReason: this.$t("取消审核"),
id: this.shipmentObj["customsApprovalInfo"].id,
shipmentId: this.shipmentObj.id,
}).then((res) => {
serviceMsg(res, this).then(() => {
// 触发外层重新查询出货信息
this.cancel("close");
this.$emit("getBoxInfo");
});
});
},
/* 取消删单退场审核 */
canclOverAudit() {
console.log(this.shipmentObj) console.log(this.shipmentObj)
approvalCancel({ approvalCancel({
applyReason: this.$t("取消审核"), applyReason: this.$t("取消审核"),
...@@ -654,8 +674,12 @@ export default { ...@@ -654,8 +674,12 @@ export default {
immediate: true, immediate: true,
handler: function (val) { handler: function (val) {
// 监听查验状态变化 // 监听查验状态变化
let { overMachineExamineStatus } = val; let { overMachineExamineStatus, checkExamineStatus } = val;
if (overMachineExamineStatus === 1) { if (overMachineExamineStatus === 1) {
// 按钮变成审核中
this.inOverReview = true;
}
if (checkExamineStatus === 1) {
// 按钮变成审核中 // 按钮变成审核中
this.inReview = true; this.inReview = true;
} }
...@@ -680,6 +704,23 @@ export default { ...@@ -680,6 +704,23 @@ export default {
computed: { computed: {
/* 获取报关审核退场状态文字 */ /* 获取报关审核退场状态文字 */
getCheckExamineStatus() { getCheckExamineStatus() {
const { checkExamineStatus, checkDealStatus, customsInfo } =
this.shipmentObj;
const { dcCheckStatus } = customsInfo ?? {};
if (checkExamineStatus === 1) {
return dcCheckStatus === 1
? this.$t("退场审核中")
: this.$t("部分退场审核中");
}
if (checkExamineStatus === 2 && checkDealStatus === 0) {
return dcCheckStatus === 1
? this.$t("审核通过，退场中")
: this.$t("审核通过，部分退场中");
}
return this.$t("未审核");
},
/* 获取报关审核退场状态文字 */
getOverExamineStatus() {
const { overMachineExamineStatus, checkDealStatus, customsInfo } = const { overMachineExamineStatus, checkDealStatus, customsInfo } =
this.shipmentObj; this.shipmentObj;
const { dcCheckStatus } = customsInfo ?? {}; const { dcCheckStatus } = customsInfo ?? {};
......
src/views/ecw/box/shippingAir/nodePage/preinstall.vue
View file @ b153d7d0
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
<el-row class="process-area"> <el-row class="process-area">
<div class="process"> <div class="process">
<div>{{$t('审批流程')}}</div> <div>{{$t('审批流程')}}</div>
<work-flow xmlkey="shipment_preassemble" v-model="selectedUsers"></work-flow> <work-flow xmlkey="shipment_order_sorting" v-model="selectedUsers"></work-flow>
</div> </div>
<div v-show="isAudit"> <div v-show="isAudit">
<el-button type="primary" @click="jumpReviewDetail">{{$t('审核中')}}</el-button> <el-button type="primary" @click="jumpReviewDetail">{{$t('审核中')}}</el-button>
......
src/views/ecw/box/shippingAir/nodePage/shipment.vue
View file @ b153d7d0
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<el-form-item :label="$t('司机联系方式')"> <el-form-item :label="$t('司机联系方式')">
<el-input v-model="airShipmentObj.driverPhone" :placeholder="$t('请输入司机联系方式')"></el-input> <el-input v-model="airShipmentObj.driverPhone" :placeholder="$t('请输入司机联系方式')"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div v-show="airShipmentObj.deliverType === '2'"> <div v-show="airShipmentObj.deliverType === '2'">
...@@ -51,15 +52,13 @@ ...@@ -51,15 +52,13 @@
<el-form-item :label="$t('司机联系方式')"> <el-form-item :label="$t('司机联系方式')">
<el-input v-model="airShipmentObj.driverPhone" :placeholder="$t('请输入司机联系方式')"></el-input> <el-input v-model="airShipmentObj.driverPhone" :placeholder="$t('请输入司机联系方式')"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item>
<work-flow xmlkey="shipment_audit" v-model="airShipmentObj.copyUserId"></work-flow>
</el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button v-if="airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1" type="primary" @click="goBmpDetail">{{$t('出货审核中')}}</el-button> <el-button v-if="airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1" type="primary" @click="$router.push({path: '/bpm/process-instance/detail', query: {id: airShipmentApprovalInfo.bpmProcessId}})">{{$t('出货审核中')}}</el-button>
<el-button v-if="airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1" type="primary" @click="canclAudit">{{$t('取消出货审核')}}</el-button> <el-button v-if="airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1" type="primary" @click="canclAudit">{{$t('取消出货审核')}}</el-button>
<el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button> <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button v-if="!airShipmentApprovalInfo || airShipmentApprovalInfo.approvalStatus != 1" type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button> <el-button v-if="!airShipmentApprovalInfo || airShipmentApprovalInfo.approvalStatus != 1" type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
...@@ -72,14 +71,14 @@ ...@@ -72,14 +71,14 @@
import { airShipmentCreate, approvalCancel } from "@/api/ecw/boxSea"; import { airShipmentCreate, approvalCancel } from "@/api/ecw/boxSea";
import userSelect from "./common/userSelect.vue"; import userSelect from "./common/userSelect.vue";
import { constantDict, formatDateStr, formatNumberString, serviceMsg } from "../utils"; import { constantDict, formatDateStr, formatNumberString, serviceMsg } from "../utils";
import WorkFlow from "@/components/WorkFlow/index.vue";
/** /**
* 驳船 * 驳船
*/ */
export default { export default {
name: "shipment", name: "shipment",
inheritAttrs: false, inheritAttrs: false,
components: { userSelect, WorkFlow }, components: { userSelect },
data() { data() {
return { return {
// 空运出货对象 // 空运出货对象
...@@ -118,19 +117,11 @@ export default { ...@@ -118,19 +117,11 @@ export default {
} }
}); });
}, },
goBmpDetail(){
this.$emit("closeDialog", 'close');
this.$router.push("/bpm/process-instance/detail?id=" + this.airShipmentApprovalInfo.bpmProcessId)
},
/* 取消审核 */ /* 取消审核 */
async canclAudit() { canclAudit() {
console.log(this.shipmentObj) console.log(this.shipmentObj)
const res = await this.$prompt(this.$t("取消审核"), this.$t("请输入取消原因"), {
confirmButtonText: this.$t("确定"),
cancelButtonText: this.$t("取消"),
})
approvalCancel({ approvalCancel({
applyReason: res.value, applyReason: this.$t("取消审核"),
id: this.airShipmentApprovalInfo.id, id: this.airShipmentApprovalInfo.id,
shipmentId: this.$attrs.shipmentObj.id, shipmentId: this.$attrs.shipmentObj.id,
}).then((res) => { }).then((res) => {
......
src/views/ecw/box/shippingDetail.vue
View file @ b153d7d0
...@@ -20,6 +20,30 @@ ...@@ -20,6 +20,30 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<div class="mt-20" v-if="type === 'shipment'">
<el-descriptions :column="1" v-if="boxAirShipmentBackVO" border label-style="width: 200px">
<el-descriptions-item :label="$t('出货方式')">
{{deliverType}}
</el-descriptions-item>
<el-descriptions-item :label="$t('送货时间') + '/' + $t('自提时间')">
{{boxAirShipmentBackVO.deliverTime}}
</el-descriptions-item>
<el-descriptions-item :label="$t('送货地址') + '/' + $t('自提地址')">
{{boxAirShipmentBackVO.deliverAddress}}
</el-descriptions-item>
<el-descriptions-item :label="$t('车牌')">
{{boxAirShipmentBackVO.licensePlate}}
</el-descriptions-item>
<el-descriptions-item :label="$t('司机')">
{{boxAirShipmentBackVO.driver}}
</el-descriptions-item>
<el-descriptions-item :label="$t('司机联系方式')">
{{boxAirShipmentBackVO.driverPhone}}
</el-descriptions-item>
</el-descriptions>
<template v-else>暂无出货审核信息</template>
</div>
<el-row style="marginTop:15px"> <el-row style="marginTop:15px">
<el-button type="primary" @click="showOrder">{{$t('订单列表')}}</el-button> <el-button type="primary" @click="showOrder">{{$t('订单列表')}}</el-button>
</el-row> </el-row>
...@@ -103,12 +127,13 @@ ...@@ -103,12 +127,13 @@
</template> </template>
<script> <script>
import { approvalDetail } from "@/api/ecw/box"; import {approvalDetail, getbox} from "@/api/ecw/box";
import { getSeaStatus, getTotlContent } from "./shippingSea/utils"; import { getSeaStatus, getTotlContent } from "./shippingSea/utils";
import { getCabinetPage } from "@/api/ecw/cabinet"; import { getCabinetPage } from "@/api/ecw/cabinet";
import { getChannelList } from "@/api/ecw/channel"; import { getChannelList } from "@/api/ecw/channel";
import Decimal from "decimal.js"; import Decimal from "decimal.js";
import ImagePreview from "@/components/ImagePreview"; import ImagePreview from "@/components/ImagePreview";
import {constantDict} from "@/views/ecw/box/shippingAir/utils";
/** /**
* 出货审核详情 * 出货审核详情
...@@ -137,6 +162,8 @@ export default { ...@@ -137,6 +162,8 @@ export default {
visible: false, visible: false,
}, },
srcStrs: [], srcStrs: [],
// 出货审核详情
boxAirShipmentBackVO: null
}; };
}, },
created() { created() {
...@@ -161,8 +188,17 @@ export default { ...@@ -161,8 +188,17 @@ export default {
? res.data.cabinetUnloadVO.ulImgs.split(",") ? res.data.cabinetUnloadVO.ulImgs.split(",")
: []; : [];
} }
// 如果是出货审核则需要调用出货详情获取出货信息
if (this.type === "shipment") {
this.getShipmentDetail();
}
}); });
}, },
getShipmentDetail(){
getbox(this.boxBackVO.id).then(res => {
this.boxAirShipmentBackVO = res.data.boxAirShipmentBackVO
})
},
/* 获取柜型 */ /* 获取柜型 */
getCabinetLabel(cabinetId) { getCabinetLabel(cabinetId) {
getCabinetPage(null).then((response) => { getCabinetPage(null).then((response) => {
...@@ -210,6 +246,9 @@ export default { ...@@ -210,6 +246,9 @@ export default {
}, },
}, },
computed: { computed: {
constantDict() {
return constantDict
},
/* 渠道 */ /* 渠道 */
getShipChannelName() { getShipChannelName() {
return (shippingChannelId) => { return (shippingChannelId) => {
...@@ -232,6 +271,11 @@ export default { ...@@ -232,6 +271,11 @@ export default {
return getSeaStatus(shippingVO) >= 182 ? true : false; return getSeaStatus(shippingVO) >= 182 ? true : false;
}; };
}, },
// 出乎方式
deliverType(){
if(!this.boxAirShipmentBackVO) return ''
return constantDict.deliverType.find(item => item.value == this.boxAirShipmentBackVO.deliverType)?.label
}
}, },
}; };
</script> </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