Commit a2327655 authored by huhaiqing's avatar huhaiqing

海运增加上传功能

parent 0ab4078e
...@@ -77,9 +77,11 @@ export default { ...@@ -77,9 +77,11 @@ export default {
methods: { methods: {
// 获取预计到港时间 // 获取预计到港时间
getExpectedTime() { getExpectedTime() {
return dayjs( const { shippingInfo } = this.$attrs.shipmentObj;
this.$attrs.shipmentObj.shippingInfo.dtEstArrivalTime if (shippingInfo) {
).format("YYYY-MM-DD"); return dayjs(shippingInfo.dtEstArrivalTime).format("YYYY-MM-DD");
}
return null;
}, },
// 时间比较 // 时间比较
compareDate(expectedTime, apConfirmTime) { compareDate(expectedTime, apConfirmTime) {
......
...@@ -16,9 +16,7 @@ ...@@ -16,9 +16,7 @@
<el-date-picker type="date" placeholder="请选择日期" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="请选择日期" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="装柜图片"> <el-form-item label="装柜图片">
<el-upload action="" :limit="1" :file-list="cabinetObj.ldPictures"> <ImageUpload :limit="1" :isShowTip=false v-model="cabinetObj.ldPictures" />
<el-button size="small" type="primary">选择文件</el-button>
</el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -41,6 +39,7 @@ ...@@ -41,6 +39,7 @@
import startPacking from "./startPacking.vue"; import startPacking from "./startPacking.vue";
import { cabinetCreate, serviceMsg } from "@/api/ecw/boxSea"; import { cabinetCreate, serviceMsg } from "@/api/ecw/boxSea";
import { formatDateStr } from "../../utils"; import { formatDateStr } from "../../utils";
import ImageUpload from "@/components/ImageUpload";
/** /**
* 装柜 * 装柜
...@@ -48,7 +47,7 @@ import { formatDateStr } from "../../utils"; ...@@ -48,7 +47,7 @@ import { formatDateStr } from "../../utils";
export default { export default {
name: "cabinet", name: "cabinet",
inheritAttrs: false, inheritAttrs: false,
components: { startPacking }, components: { startPacking, ImageUpload },
data() { data() {
return { return {
// 弹窗 // 弹窗
......
...@@ -46,9 +46,7 @@ ...@@ -46,9 +46,7 @@
<el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclarationObj.dcCheckTime" value-format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclarationObj.dcCheckTime" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="查验前图片"> <el-form-item label="查验前图片">
<el-upload action="" :limit="1" :file-list="cusDeclarationObj.dcCheckPreImg"> <ImageUpload :limit="1" :isShowTip=false v-model="cusDeclarationObj.dcCheckPreImg" />
<el-button size="small" type="primary">选择文件</el-button>
</el-upload>
</el-form-item> </el-form-item>
<el-form-item label="新封条"> <el-form-item label="新封条">
<el-input v-model="cusDeclarationObj.dcStripSeal" placeholder="请输入新封条" clearable /> <el-input v-model="cusDeclarationObj.dcStripSeal" placeholder="请输入新封条" clearable />
...@@ -133,13 +131,15 @@ ...@@ -133,13 +131,15 @@
import supplierSelect from "./common/supplierSelect.vue"; import supplierSelect from "./common/supplierSelect.vue";
import { customsCreate, serviceMsg } from "@/api/ecw/boxSea"; import { customsCreate, serviceMsg } from "@/api/ecw/boxSea";
import { formatNumberString, formatDateStr } from "../utils"; import { formatNumberString, formatDateStr } from "../utils";
import ImageUpload from "@/components/ImageUpload";
/** /**
* 报关 * 报关
*/ */
export default { export default {
name: "cusDeclaration", name: "cusDeclaration",
inheritAttrs: false, inheritAttrs: false,
components: { supplierSelect }, components: { supplierSelect, ImageUpload },
data() { data() {
return { return {
// 报关对象 // 报关对象
......
...@@ -97,16 +97,7 @@ export default { ...@@ -97,16 +97,7 @@ export default {
markNo: "N/M", markNo: "N/M",
}, },
// 出单方式 // 出单方式
method: [ method: constantDict.billingMethod,
{
value: "1",
label: "正本",
},
{
value: "2",
label: "电放",
},
],
// 单位 // 单位
units: [], units: [],
// 柜型 // 柜型
...@@ -132,6 +123,7 @@ export default { ...@@ -132,6 +123,7 @@ export default {
const voName = this.$attrs.currNode.voName; const voName = this.$attrs.currNode.voName;
let oldData = { ...this.shipmentObj[voName] }; let oldData = { ...this.shipmentObj[voName] };
oldData = formatNumberString(oldData, ["issueType"]);
this.subMaterialObj = oldData; this.subMaterialObj = oldData;
}, },
methods: { methods: {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">保存</el-button> <el-button type="primary" @click="onSubmit(1)">保存</el-button>
<el-button type=" success" @click="onSubmit(2)">提交</el-button> <el-button type="success" @click="onSubmit(2)">提交</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">关闭</el-button>
<el-button type="danger" @click="startUnloading">开始卸柜</el-button> <el-button type="danger" @click="startUnloading">开始卸柜</el-button>
</el-row> </el-row>
......
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
// 用户 // 用户
allUsers: [], allUsers: [],
// 流程图节点 // 流程图节点
seaBaseData: seaBaseData, seaBaseData: seaBaseData(),
// 状态 // 状态
statusLabel: "", statusLabel: "",
}; };
......
...@@ -59,7 +59,8 @@ statusName.set(151, "未结算"); ...@@ -59,7 +59,8 @@ statusName.set(151, "未结算");
statusName.set(152, "结算中"); statusName.set(152, "结算中");
statusName.set(153, "已结算"); statusName.set(153, "已结算");
const seaBaseData = [ const seaBaseData = () => {
return [
[ [
{ {
title: "订舱", title: "订舱",
...@@ -377,7 +378,8 @@ const seaBaseData = [ ...@@ -377,7 +378,8 @@ const seaBaseData = [
}, },
}, },
], ],
]; ];
};
const constantDict = { const constantDict = {
// 配船状态 // 配船状态
......
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