朱兆平 / vue_cli · 提交

转到一个项目

作者 唐俊升
提交 72a7ca4222f7b4dd3df18a1619c512d987c79935 2 个父辈 66b9571a 8c7ad08e

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 4 个修改的文件 包含 61 行增加 和 3 行删除
... ... @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>易通链快速通关申报平台</title>
<title>物流信息平台</title>
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
</head>
... ...
... ... @@ -20,7 +20,7 @@
<div align="center" style="height: 66px;line-height: 66px;">
<!-- <img id="logo" src="~@/assets/logo1.png">-->
<h1 id="logo-text" style="color:white;display: inline-block;font-weight: 600;font-size: 15px;line-height: 50px"> &nbsp; &nbsp;物流公共信息服务平台</h1>
<h1 id="logo-text" style="color:white;display: inline-block;font-weight: 600;font-size: 15px;line-height: 50px"> &nbsp; &nbsp;物流信息平台</h1>
</div>
<template v-for="(item,index) in menu">
<el-submenu :index="index+''" v-if="item.hasChild">
... ...
... ... @@ -603,6 +603,27 @@
Also Notify Area
</el-col>
</el-row>
<el-row style="padding-top: 10px">
<el-col :span="22" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;border-left:1px solid #a5a5a5;padding: 5px">
<span style="font-size: 12px">
Special Handling Details
</span>
<el-row style="margin-bottom: -2px">
<el-col style="width: 100%">
<el-form-item>
<!-- 每行65个字符-->
<el-input
v-model="sphCodes"
show-word-limit
maxlength="27"
type="textarea"
:autosize="{ minRows: 1, maxRows: 9}"
auto-complete="off" placeholder="特殊操作代码列表,一行一个代码,最多9行"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
<!-- 处理信息-->
<el-row style="padding-top: 10px">
<el-col :span="22" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;border-left:1px solid #a5a5a5;padding: 5px">
... ... @@ -2290,8 +2311,12 @@ Handling Information
},
cer:{
cer_signature:' DHL GLOBAL'
},
sph:{
sph_code:[]
}
},
sphCodes: "",
ssr_content:"NO SOLID WOODEN PACKING MATERIALS",
cne_contact:{
contact_id:'TE',
... ... @@ -3049,6 +3074,13 @@ Handling Information
//const O38 = (worksheet['O38'] && worksheet['O38'].v) || '';
const X38 = (worksheet['X38'] && worksheet['X38'].v) || '';
const AF38 = (worksheet['AF38'] && worksheet['AF38'].v) || '';
//判定acc 中是否包含COU 特殊操作代码
const S10 = (worksheet['S10'] && worksheet['S10'].v) || '';
if (S10.includes("COU")){
this.sphCodes += "COU"
}
if(I18.includes("/")){
const inFlightInfo = I18.split('/');
... ... @@ -3221,6 +3253,26 @@ Handling Information
this.ssr_content = value; // 更新视图中的数据
}
},
sphCodeFormat:{
get(){
return this.sphCodes;
},
set(value){
const lines = value.split('\n');
if (lines.length > 9) {
this.$message.error('最多只能输入9行文本！');
return;
}
for (let line of lines) {
if (line.length > 3) {
this.$message.error('每行不能超过3个字符！每行一个特殊操作代码,如:ELI');
return;
}
}
this.form.sph.sph_code = lines
this.sphCodes = value;
}
},
flightNumber: {
get() {
// 返回拼接后的完整航班号
... ... @@ -3254,6 +3306,12 @@ Handling Information
this.formattedSsrContent = newVal; // 触发计算属性的setter
},
immediate: true // 立即执行监听器
},
sphCodes:{
handler(newVal) {
this.sphCodeFormat = newVal; // 触发计算属性的setter
},
immediate: true // 立即执行监听器
}
}
}
... ...
... ... @@ -2989,7 +2989,7 @@ Handling Information
if (totalVolume>0){
totalVolume = Math.floor(totalVolume * 100) / 100;
}
this.form.bill.quantity_volume=totalVolume;
return {
converted: output.trim(),
totalVolume: totalVolume
... ...