lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

Browse Source
szh-new
sunzehua 2 months ago
parent db0fe0ab3b 790dd8e23e
commit 18e2959d18
6 changed files with 95 additions and 81 deletions
Show Stats Download Patch File Download Diff File

4
src/views/mapping/sign/columns.tsx
Unescape Escape View File

@ -64,7 +64,7 @@ export const searchFormSchema: FormSchema[] = [
return {
api: GetIssueTypeSelectList,
labelField: 'billType',
valueField: 'copyNoBill',
valueField: 'id',
resultField: 'data',
}
}
@ -113,7 +113,7 @@ export const formSchema: FormSchema[] = [
return {
api: GetIssueTypeSelectList,
labelField: 'billType',
valueField: 'copyNoBill',
valueField: 'id',
showSearch: true,
resultField: 'data',
onChange: (v, obj) => {

2
src/views/operation/seaexport/columns.tsx
Unescape Escape View File

@ -286,7 +286,7 @@ export const searchFormSchema: FormSchema[] = [
return {
api: GetCustomerServiceList,
labelField: 'pinYinCode',
valueField: 'userCode',
valueField: 'id',
showName: 'userName',
immediate: false,
resultField: 'data'

1
src/views/operation/seaexport/detail/modules/baseInfo.tsx
Unescape Escape View File

@ -284,7 +284,6 @@ export const basicInfoFormSchema: FormSchema[] = [
label: '订舱口',
field: 'forwarder',
component: 'ApiSelect',
required: true,
defaultValue: null,
dynamicDisabled: false,
colProps: { span: 5 },

32
src/views/operation/seaexport/detail/modules/goodsTable.vue
Unescape Escape View File

@ -238,7 +238,7 @@
} from '/@/views/operation/seaexport/api/BookingLedger'
import { ref, Ref, watchEffect, watch, onMounted, nextTick, onUnmounted } from 'vue'
import { useMessage } from '/@/hooks/web/useMessage'
const { notification, createMessage } = useMessage()
const { createMessage } = useMessage()
import { useRoute } from 'vue-router'
import { HotTable } from '@handsontable/vue3'
import { registerAllModules } from 'handsontable/registry'
@ -972,10 +972,7 @@
// 打开多品名
function openDialog() {
if (list.value.length === 0) {
notification.error({
message: '请至少添加一个集装箱',
duration: 3,
})
createMessage.warning('请至少添加一个集装箱！')
} else {
list.value.forEach((item, index) => {
if (index == 0) {
@ -1016,7 +1013,7 @@
ctnId: moreTList.value[moreSelectNum.value].id,
detail: detail,
}).then((res) => {
notification.success({ message: '已保存', duration: 3 })
createMessage.success('保存成功！')
})
}
// 多品名 删除
@ -1262,6 +1259,7 @@
},
])
function init(data, hot) {
console.log(data)
const { ctnInfo } = data
if (ctnInfo && ctnInfo.length > 0) {
totalPkgs.value = 0
@ -1422,7 +1420,7 @@
let type = true
list.value.forEach((item) => {
if (item.sealNo || item.cntrNo) {
notification.error({ message: '请清空所有箱封号后再引入', duration: 3 })
createMessage.warning('请清空所有箱封号后再引入！')
type = false
}
})
@ -1436,11 +1434,11 @@
})
computing()
} else {
notification.error({ message: '箱量与场站不一致', duration: 3 })
createMessage.warning('箱量与场站不一致！')
}
}
} else {
notification.error({ message: res.message, duration: 3 })
createMessage.warning(res.message)
}
sealnoLoading.value = false
})
@ -1450,7 +1448,7 @@
}
function importWeight() {
if (!props.details.id) {
notification.error({ message: '请先保存订舱信息', duration: 3 })
createMessage.warning('请先保存订舱信息！')
return false
}
WeightLoading.value = true
@ -1509,7 +1507,7 @@
}
})
} else {
notification.error({ message: res.message, duration: 3 })
createMessage.warning(res.message)
}
WeightLoading.value = false
})
@ -1528,7 +1526,7 @@
})
if (SelectData.length != 1) {
notification.error({ message: '请选择一条数据', duration: 3 })
createMessage.warning('请选择一条数据！')
} else {
if (SelectData[0].ctnNum > 1) {
if (
@ -1549,10 +1547,10 @@
list.value.splice(SelectIndex, 1)
list.value.splice(SelectIndex, 0, ...Arr)
} else {
notification.error({ message: '所选数据的件数应大于等于箱量', duration: 3 })
createMessage.warning('所选数据的件数应大于等于箱量！')
}
} else {
notification.error({ message: '所选数据的箱量应大于1', duration: 3 })
createMessage.warning('所选数据的箱量应大于1！')
}
}
}
@ -1925,7 +1923,7 @@
}
})
if (total > moreTList.value[moreSelectNum.value].pkgs) {
notification.warning({ message: '件数超过总量,将无法保存！', duration: 3 })
createMessage.warning('件数超过总量,将无法保存！')
isSave.value[0] = true
} else {
isSave.value[0] = false
@ -1940,7 +1938,7 @@
}
})
if (total > moreTList.value[moreSelectNum.value].kgs) {
notification.warning({ message: '毛重超过总量,将无法保存！', duration: 3 })
createMessage.warning('毛重超过总量,将无法保存！')
isSave.value[1] = true
} else {
isSave.value[1] = false
@ -1955,7 +1953,7 @@
}
})
if (total > moreTList.value[moreSelectNum.value].cbm) {
notification.warning({ message: '毛重超过总量,将无法保存！', duration: 3 })
createMessage.warning('毛重超过总量,将无法保存！')
isSave.value[2] = true
} else {
isSave.value[2] = false

116
src/views/operation/seaexport/detail/modules/operationArea.vue
Unescape Escape View File

@ -878,67 +878,79 @@
}
// 订舱 保存 或 上传 EDI
function handleModelSubmit(type) {
const data = {
...bookingModelFrom,
id: props.details.id,
fileRole: bookingModelFrom.fileRole,
sendType: modelType.value === 'bookingSpace' ? 'B' : 'E',
}
EDISloading.value = true
if (modelType.value === 'bookingSpace') {
// 订舱
if (type == 'save') {
// 保存EDI文件
EDISloading.value = true
downloadBookingOrEDI(type)
} else {
// 上传EDI
EDIUloading.value = true
sendBookingOrEDI(type)
}
} else {
// 截单
CheckAndInitVOLTAEdi(data).then((res) => {
if (res.code === 200) {
voltaForm.value = res.data.extra
voltaFlag.value = true
if (res.data.msg) {
notification.warning({ message: res.data.msg, duration: 3 })
}
if (!voltaForm.value.notifySecondAddr) {
voltaForm.value.notifySecondAddr = ''
}
if (!voltaForm.value.notifySecondName) {
voltaForm.value.notifySecondName = ''
}
voltaData.value = res.data.extra.contaList
EDISloading.value = false
} else {
// this.$message.error(res.message)
if (modelType.value === 'bookingSpace') {
bookingModelFrom.sendType = 'B'
} else if (modelType.value === 'cutOff') {
bookingModelFrom.sendType = 'E'
}
bookingModelFrom.send = type === 'send'
bookingModelFrom.orderNo = props.details.mblno
bookingModelFrom.id = props.id
if (type == 'save') {
// 保存EDI文件
EDISloading.value = true
// EDISloading.value = true
downloadBookingOrEDI(type)
} else {
// 上传EDI
EDIUloading.value = true
// EDIUloading.value = true
sendBookingOrEDI(type)
}
}
})
}
// const data = {
// ...bookingModelFrom,
// id: props.details.id,
// fileRole: bookingModelFrom.fileRole,
// sendType: modelType.value === 'bookingSpace' ? 'B' : 'E',
// }
// EDISloading.value = true
// if (modelType.value === 'bookingSpace') {
// // 订舱
// if (type == 'save') {
// // 保存EDI文件
// EDISloading.value = true
// downloadBookingOrEDI(type)
// } else {
// // 上传EDI
// EDIUloading.value = true
// sendBookingOrEDI(type)
// }
// } else {
// // 截单
// CheckAndInitVOLTAEdi(data).then((res) => {
// if (res.code === 200) {
// voltaForm.value = res.data.extra
// voltaFlag.value = true
// if (res.data.msg) {
// notification.warning({ message: res.data.msg, duration: 3 })
// }
// if (!voltaForm.value.notifySecondAddr) {
// voltaForm.value.notifySecondAddr = ''
// }
// if (!voltaForm.value.notifySecondName) {
// voltaForm.value.notifySecondName = ''
// }
// voltaData.value = res.data.extra.contaList
// EDISloading.value = false
// } else {
// // this.$message.error(res.message)
// if (modelType.value === 'bookingSpace') {
// bookingModelFrom.sendType = 'B'
// } else if (modelType.value === 'cutOff') {
// bookingModelFrom.sendType = 'E'
// }
// bookingModelFrom.send = type === 'send'
// bookingModelFrom.orderNo = props.details.mblno
// bookingModelFrom.id = props.id
// if (type == 'save') {
// // 保存EDI文件
// EDISloading.value = true
// downloadBookingOrEDI(type)
// } else {
// // 上传EDI
// EDIUloading.value = true
// sendBookingOrEDI(type)
// }
// }
// }).catch(() => {
// EDISloading.value = false
// })
// }
}
function sendBookingOrEDI(type) {
const postData = JSON.parse(JSON.stringify(bookingModelFrom))
postData.send = true
postData.sendType = modelType.value === 'bookingSpace' ? 'B' : 'E',
SendBookingOrClosingEDI(postData)
.then((res) => {
EDISloading.value = false
@ -956,7 +968,9 @@
})
}
function downloadBookingOrEDI(type) {
DownloadBookingOrClosingEDI(bookingModelFrom)
const postData = JSON.parse(JSON.stringify(bookingModelFrom))
postData.sendType = modelType.value === 'bookingSpace' ? 'B' : 'E',
DownloadBookingOrClosingEDI(postData)
.then((res) => {
EDISloading.value = false
EDIUloading.value = false

11
src/views/operation/seaexport/detail/modules/rightContent.vue
Unescape Escape View File

@ -69,10 +69,13 @@
>
<span v-if="(sindex - 3) % 4 != 0" style="position: absolute; right: -5px; color: #257AFA;">···</span>
<a-tooltip>
<template v-if="(serive.actDate || serive.actRemark) && !serive.isBr" #title>
<p v-if="serive.actDate">时间：{{ serive.actDate }}</p>
<p v-if="serive.actRemark">备注：{{ serive.actRemark }}</p>
<p v-if="serive.actVal">显示天数：{{ serive.actVal }}</p>
<template v-if="serive.actDate || serive.actRemark || serive.allotUserList" #title>
<div v-for="(item, index) in serive.allotUserList || []" :key="'s-g-' + index">
{{ item.UserName }}({{ item.StatusName }}) {{ item.StatusTime }}
</div>
<div v-if="serive.actDate">时间：{{ serive.actDate }}</div>
<div v-if="serive.actRemark">备注：{{ serive.actRemark }}</div>
<div v-if="serive.actVal">显示天数：{{ serive.actVal }}</div>
</template>
<div
v-if="!changeGoods"

Write Preview
Loading…
Cancel
Save