From 2ec2a96d9bb31c24e806709ef8df1bd9172f8c02 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期四, 10 四月 2025 09:15:22 +0800
Subject: [PATCH] feat
---
src/view/addOrder.vue | 123 ++++++++++++----------------------------
1 files changed, 38 insertions(+), 85 deletions(-)
diff --git a/src/view/addOrder.vue b/src/view/addOrder.vue
index bdbbc4f..e2a3a5a 100644
--- a/src/view/addOrder.vue
+++ b/src/view/addOrder.vue
@@ -77,8 +77,8 @@
</div>
<div class="box_text2">Carrier</div>
</div>
- <el-select :disabled="type != 'add'" v-model="form.carrier" clearable placeholder="请选择">
- <el-option :label="item.label" :value="item.value" v-for="item in optionsSc"
+ <el-select :disabled="type != 'add'" v-model="form.carrier" clearable placeholder="请选择">
+ <el-option :label="item.code" :value="item.code" v-for="item in optionsSc"
:key="item.value"></el-option>
</el-select>
</div>
@@ -531,7 +531,6 @@
<div class="box_text2">Delivery Schedule</div>
</div>
<el-input v-model="form.deliverySchedule" readonly></el-input>
-
</div>
</el-form-item>
</div>
@@ -545,7 +544,6 @@
<div class="box_text2">Actual Delivery Date</div>
</div>
<el-input v-model="form.actualSchedule" readonly></el-input>
-
</div>
</el-form-item>
<el-form-item label="" class="label3" label-width="0px">
@@ -570,7 +568,7 @@
<el-input v-model="form.emptyReturnDate" readonly></el-input>
</div>
</el-form-item>
- <el-form-item label="" class="label1" label-width="0">
+ <el-form-item label="" class="label1" label-width="0">
<div class="flex">
<div class="label shrink0">
<div class="flex">
@@ -582,7 +580,18 @@
<el-input v-model="form.frameNumber" readonly></el-input>
</div>
</el-form-item>
+
</div>
+ <div class="flex">
+ <div class="label shrink0">
+ <div class="flex">
+ <!-- <div class="red">*</div> -->
+ <div class="box_text1">备注：</div>
+ </div>
+ <div class="box_text2">Remarks</div>
+ </div>
+ <el-input type="textarea" :rows="4" v-model="form.customerRemark" readonly style="margin-right: 135px;"></el-input>
+ </div>
</div>
</el-card>
<el-card class="box-card mt-13">
@@ -642,7 +651,7 @@
</template>
<script>
-import { addOrder, getaddress, edit, getDetail, saveInfo } from './addservier'
+import { addOrder, getaddress, edit, getDetail, saveInfo, getCarrierList } from './addservier'
import 'quill/dist/quill.core.css'
import 'quill/dist/quill.snow.css'
import 'quill/dist/quill.bubble.css'
@@ -675,10 +684,10 @@
vesselAndVoyage: "", //航名航次
pickupLocation: "", //提柜地
ETA: "", //预计到达日期
- SOC: "", //SOC
- DG: "", //DG
- overweight: "", //超重
- customsInspection: "", //查验
+ SOC: "否", //SOC
+ DG: "否", //DG
+ overweight: "是", //超重
+ customsInspection: "否", //查验
dropOrLive: "", //DROP/LIVE
clientOrder: "", //客户订单号
product: "", //品名
@@ -756,77 +765,7 @@
label: "其他",
},
],
- optionsSc: [
- {
- value: "COSCO",
- label: "COSCO",
- },
- {
- value: "OOCL",
- label: "OOCL",
- },
- {
- value: "ONE",
- label: "ONE",
- },
- {
- value: "CMA CGM",
- label: "CMA CGM",
- },
- {
- value: "EVERGREEN",
- label: "EVERGREEN",
- },
- {
- value: "ZIM",
- label: "ZIM",
- },
- {
- value: "YANG MING",
- label: "YANG MING",
- },
- {
- value: "WANHAI LINE",
- label: "WANHAI LINE",
- },
- {
- value: "MAERSK",
- label: "MAERSK",
- },
- {
- value: "MSC",
- label: "MSC",
- },
- {
- value: "HMM",
- label: "HMM",
- },
- {
- value: "HPL",
- label: "HPL",
- },
- {
- value: "HDW",
- label: "HDW",
- },
- {
- value: "T.S.LINE",
- label: "T.S.LINE",
- },
- {
- value: "SEA LEAD",
- label: "SEA LEAD",
- },
- {
- value: "SM LINE",
- label: "SM LINE",
- },
- {
- value: "OTHERS",
- label: "OTHERS",
- }
-
- ],
+ optionsSc: [],
//COSCO、OOCL、ONE、CMA CGM、EVERGREEN(EMC)、ZIM、YANG MING(YML)、WANHAI LINE(WHL)、MAERSK(MSK)、MSC、HMM、HPL、HDW、T.S.LINE、SEA LEAD、SM LINE、OTHERS
optionsCpa: [
{
@@ -958,10 +897,9 @@
}).then(resp => {
this.form = resp.data
this.detailInfo = resp.data
- if (resp.data.poundWeight) {
- resp.data.poundWeight = resp.data.poundWeight.toFixed(2) * 1
- }
-
+ // if (resp.data.poundWeight) {
+ // resp.data.poundWeight = resp.data.poundWeight.toFixed(2) * 1
+ // }
if (resp.data.DOFileUrls) {
resp.data.DOFileUrls.map(item => {
this.fileList1.push({ url: item.url, name: item.url.split('ownload/')[1] })
@@ -977,10 +915,15 @@
this.fileList3.push({ url: item.url, name: item.url.split('ownload/')[1] })
})
}
+ console.log(resp.data.otherFileUrls,'resp.data.otherFileUrls');
+
if (resp.data.otherFileUrls) {
+ console.log(this.fileList4);
+
resp.data.otherFileUrls.map(item => {
this.fileList4.push({ url: item.url, name: item.url.split('ownload/')[1] })
})
+
}
})
}
@@ -1004,6 +947,16 @@
})
+ getCarrierList({
+ extra: JSON.parse(localStorage.getItem('userInfo')).extra
+ }).then(resp => {
+ this.optionsSc = resp.data
+ .sort((a, b) => {
+ if (a.code < b.code) return -1
+ if (a.code > b.code) return 1
+ return 0
+ })
+ })
},
methods: {
addShow() {
--
Gitblit v1.7.1