whm
/
BookingHeChuanFront
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

11/25

Browse Source
dev
张同海 2 years ago
parent 43e445fc93
commit e8170f3072
4 changed files with 181 additions and 149 deletions
Show Stats Download Patch File Download Diff File

3
.env
Unescape Escape View File

@ -1,4 +1,5 @@
NODE_ENV=production
VUE_APP_PREVIEW=true
VUE_APP_API_BASE_URL=http://192.168.1.205:25800
//VUE_APP_API_BASE_URL=http://192.168.1.205:25800
VUE_APP_API_BASE_URL=http://60.209.125.238:25805
//VUE_APP_API_BASE_URL=http://127.0.0.1:5000

139
src/views/main/BookingLedger/detail/components/ediMore.vue
Unescape Escape View File

@ -2,60 +2,50 @@
<div class="more-edi">
<a-form>
<a-row :gutter="16">
<a-col :span="24">
<a-form-item
label="委托方"
:labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-textarea placeholder="请输入委托方" v-model="details.bookingEDIExt.weiTuoFang" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="发送方EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入发送方EDI代码" v-model="details.bookingEDIExt.sendCode" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="接收方EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入接收方EDI代码" v-model="details.bookingEDIExt.receiveCode" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="通知放EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入通知放EDI代码" v-model="details.bookingEDIExt.notifyCdoe" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="销售EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入销售EDI代码" v-model="details.bookingEDIExt.salerCode" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="Master Bol Indicator"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
@ -66,10 +56,10 @@
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="销EMANIFEST HBL"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
label="EMANIFEST HBL"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
@ -80,10 +70,10 @@
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="收货人EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
@ -94,10 +84,10 @@
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="发货人EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
@ -108,157 +98,168 @@
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="EDI联系人名称"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入EDI联系人名称" v-model="details.bookingEDIExt.ediAttn" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="EDI联系人电话"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入EDI联系人电话" v-model="details.bookingEDIExt.ediAttnTel" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="EDI联系人邮箱"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入EDI联系人邮箱" v-model="details.bookingEDIExt.ediAttnMail" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="AMS收货人"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入AMS收货人" v-model="details.bookingEDIExt.amsConsignee" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="AMS通知人"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入AMS通知人" v-model="details.bookingEDIExt.amsNotifyParty" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="操作英文名称"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入操作英文名称" v-model="details.bookingEDIExt.opEName" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="操作电话"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入操作电话" v-model="details.bookingEDIExt.opTel" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="操作邮箱"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入操作邮箱" v-model="details.bookingEDIExt.opEmail" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="ACI HBL O(加拿大)"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
label="ACI HBL:"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入ACI HBL O(加拿大)" v-model="details.bookingEDIExt.acihbl" />
<a-input :allowClear="true" placeholder="请输入ACI HBL" v-model="details.bookingEDIExt.acihbl" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="S0C C0C O(加拿大)"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
label="S0C C0C:"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入S0C C0C O(加拿大)" v-model="details.bookingEDIExt.s0CC0C" />
<a-input :allowClear="true" placeholder="请输入S0C C0C" v-model="details.bookingEDIExt.s0CC0C" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="商品名称"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入商品名称" v-model="details.bookingEDIExt.goodsName" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-col :span="8">
<a-form-item
label="付款方"
:labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
label="SOC箱"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入付款方" v-model="details.freightpayer" />
<a-select :default-value="iscontainersoc" style="width: 120px" v-model="iscontainersoc">
<a-select-option value="1"> 是 </a-select-option>
<a-select-option value="0"> 否 </a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="SCAC代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入SCAC代码" v-model="details.scaccode" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="8">
<a-form-item
label="ITN编号"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
>
<a-input :allowClear="true" placeholder="请输入ITN编号" v-model="details.itncode" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="23">
<a-form-item
label="SOC箱"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
label="付款方"
:labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
has-feedback
>
<a-select :default-value="iscontainersoc" style="width: 120px" v-model="iscontainersoc">
<a-select-option value="1"> 是 </a-select-option>
<a-select-option value="0"> 否 </a-select-option>
</a-select>
<a-input :allowClear="true" placeholder="请输入付款方" v-model="details.freightpayer" />
</a-form-item>
</a-col>
<a-col :span="23">
<a-form-item
label="委托方"
:labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
has-feedback
>
<a-textarea placeholder="请输入委托方" v-model="details.bookingEDIExt.weiTuoFang" />
</a-form-item>
</a-col>
</a-row>

12
src/views/main/BookingLedger/detail/modules/operationArea.vue
Unescape Escape View File

@ -27,8 +27,10 @@
</div>
<div class="btn-list more-view-1">
<button @click="openModel('bookingSpace')"><span class="iconfont icon-chuanbo"></span>订舱</button>
<button @click="openModel('cutOff')"><span class="iconfont icon-daibanshixiang"></span>截单</button>
<button><span class="iconfont icon-xiugai"></span>更改及退舱</button>
<button @click="openModel('cutOff')" :style="{ marginLeft: '4px' }">
<span class="iconfont icon-daibanshixiang"></span>截单
</button>
<button><span class="iconfont icon-xiugai" :style="{ marginLeft: '8px' }"></span>更改及退舱</button>
<button @click="openModel('vgm')"><span class="iconfont icon-dingdan"></span>VGM</button>
<button @click="openModel('paper')"><span class="iconfont icon-zhizhishu"></span>下货纸</button>
</div>
@ -36,7 +38,9 @@
<button @click="openModel('initCabin')">
<span class="iconfont icon-chuanfanguanli-chuanfanshenqing"></span>放舱
</button>
<button @click="openModel('ladingBill')"><span class="iconfont icon-zhcc_tidan"></span>提单确认</button>
<button @click="openModel('ladingBill')" :style="{ marginLeft: '32px' }">
<span class="iconfont icon-zhcc_tidan"></span>提单确认
</button>
<button @click="openModel('vgmlink')"><span class="iconfont icon-lianjie"></span>VGM链接</button>
<button @click="TxxpLink"><span class="iconfont icon-dayinxiaopiao"></span>提箱小票</button>
</div>
@ -880,7 +884,7 @@ export default {
},
checkFun() {
this.$message.loading({ content: '校验中...' });
this.$message.loading({ content: '校验中...' })
ExcuteRulesOceanBooking(this.id)
.then(res => {
if (res.success) {

88
src/views/main/BookingLedger/detail/modules/rightContent.vue
Unescape Escape View File

@ -25,7 +25,15 @@
<a-card :bodyStyle="tstyle" :bordered="false">
<div class="title"><i class="iconfont icon-fuwu"></i><span>服务项目</span></div>
<div class="content">
<div class="items" v-for="(serive, sindex) in bookingServiceItem" :key="sindex" :class="{'active': locaService.includes(serive.name)}" @click="saveService(serive.name)">{{ serive.name }}</div>
<div
class="items"
v-for="(serive, sindex) in bookingServiceItem"
:key="sindex"
:class="{ active: locaService.includes(serive.name) }"
@click="saveService(serive.name)"
>
{{ serive.name }}
</div>
</div>
</a-card>
<a-card :bodyStyle="tstyle" :bordered="false">
@ -78,7 +86,11 @@
<div class="title"><i class="iconfont icon-lightning-full"></i><span>订单及货运动态</span></div>
<div class="content">
<div class="booking-log" v-for="(bookingLog, bindex) in bookingLogList" :key="bindex">
<div class="log" :class="{'hideline': bindex === bookingLogList.length-1 && bookingLog.detail.length === 0}" @click="bookingShow(bookingLog)">
<div
class="log"
:class="{ hideline: bindex === bookingLogList.length - 1 && bookingLog.detail.length === 0 }"
@click="bookingShow(bookingLog)"
>
<span class="log-time">{{ bookingLog.opTime }}</span>
<i class="iconfont icon-jian icon" v-if="bookingLog.detail.length > 0 && bookingLog.isChecked"></i>
<i class="iconfont icon-jia icon" v-else-if="bookingLog.detail.length > 0 && !bookingLog.isChecked"></i>
@ -127,15 +139,26 @@
<span class="btn">
{{ log.createdTime }}
<!-- <span class="more"> -->
<i class="iconfont icon-xia more" v-if="log.details.length > 0" :class="!log.showMore ? 'hide' : 'show'" @click="showLogMore(lindex)"></i>
<i
class="iconfont icon-xia more"
v-if="log.details.length > 0"
:class="!log.showMore ? 'hide' : 'show'"
@click="showLogMore(lindex)"
></i>
<!-- </span> -->
</span>
</div>
<div class="more-detail" v-if="log.details.length > 0 && log.showMore">
<div class="detail-single" v-for="(child, cindex) in log.details" :key="cindex">
<div class="old"><span class="o-title">{{ child.field || '字段' }} :</span> <span class="content">{{ child.oldValue }}</span> </div>
<div class="old">
<span class="o-title">{{ child.field || '字段' }} :</span>
<span class="content">{{ child.oldValue }}</span>
</div>
<div class="line">改为：</div>
<div class="new"><span class="o-title">{{ child.field || '字段' }}:</span><span class="content">{{ child.newValue }}</span></div>
<div class="new">
<span class="o-title">{{ child.field || '字段' }}:</span
><span class="content">{{ child.newValue }}</span>
</div>
</div>
</div>
</div>
@ -192,19 +215,19 @@ export default {
type: Object,
default: () => {
return {}
},
}
},
excuteRules: {
type: Array,
default: () => {
return []
},
}
},
excuteRulesType: {
type: String,
default: () => {
return ''
},
}
}
},
data() {
@ -250,14 +273,14 @@ export default {
// 备注 - start
getRemark() {
GetRemark({
id: this.id,
id: this.id
})
.then((res) => {
.then(res => {
if (res.success) {
this.remarkList = res.data
}
})
.catch((err) => {
.catch(err => {
console.log(err)
})
},
@ -268,16 +291,16 @@ export default {
handleModelSubmit() {
AddRemark({
pId: this.id,
remark: this.remarkVal,
remark: this.remarkVal
})
.then((res) => {
.then(res => {
if (res.success) {
this.$message.info('备注提交成功')
this.handleModelCancel()
this.getRemark()
}
})
.catch((err) => {
.catch(err => {
console.log(err)
})
},
@ -289,14 +312,14 @@ export default {
// 附件 - start
getFile() {
GetFile({
id: this.id,
id: this.id
})
.then((res) => {
.then(res => {
if (res.success) {
this.fileList = res.data
}
})
.catch((err) => {
.catch(err => {
console.log(err)
})
},
@ -343,7 +366,7 @@ export default {
formData.append('TypeName', attachName)
this.uploading = true
AddFile(formData)
.then((res) => {
.then(res => {
if (res.success) {
this.$message.success('上传成功')
this.getFile()
@ -353,7 +376,7 @@ export default {
this.uploading = false
this.fileModelCancel()
})
.catch((err) => {
.catch(err => {
console.log(err)
this.$message.error(err.message)
})
@ -363,28 +386,28 @@ export default {
// 获取动态
getBookingLog() {
GetBookingLog({
id: this.id,
id: this.id
})
.then((res) => {
.then(res => {
if (res.success) {
this.bookingLogList = res.data
}
})
.catch((err) => {
.catch(err => {
console.log(err)
})
},
// 获取日志
getLog() {
GetLog({
id: this.id,
id: this.id
})
.then((res) => {
.then(res => {
if (res.success) {
this.logList = res.data
}
})
.catch((err) => {
.catch(err => {
console.log(err)
})
},
@ -410,7 +433,7 @@ export default {
this.$set(value, this.id, this.locaService)
window.localStorage.setItem('locaService', JSON.stringify(value))
}
},
}
}
</script>
<style lang="less" scoped>
@ -578,7 +601,8 @@ export default {
width: 1px;
height: 120%;
background: #ccc;
top: 0;left: 0;
top: 0;
left: 0;
top: 22px;
left: 77px;
}
@ -625,7 +649,8 @@ export default {
height: 120%;
// background: @primary-color;
background: #ccc;
top: 0;left: 0;
top: 0;
left: 0;
top: 22px;
left: 77px;
}
@ -783,6 +808,7 @@ export default {
padding: 0 8px;
overflow: hidden;
&:nth-of-type(1) {
padding: 0 19px;
border-right: none;
}
&:nth-of-type(2) {
@ -793,7 +819,7 @@ export default {
.more {
width: 30px;
text-align: center;
transition: .5s all;
transition: 0.5s all;
position: absolute;
top: 0;
right: 4px;
@ -818,12 +844,12 @@ export default {
border: none;
}
.old {
height: 26px;
// height: 26px;
line-height: 26px;
color: #666;
}
.new {
height: 26px;
// height: 26px;
line-height: 26px;
color: #f9a629;
}

Write Preview
Loading…
Cancel
Save