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

Merge branch 'ljj_dev' into dev

Browse Source
szh-new
lijingjia 3 months ago
parent 5c5520fc05 8716aa9622
commit d708abc8dd
13 changed files with 105 additions and 88 deletions
Show Stats Download Patch File Download Diff File

1
src/components/ApproveBtns/index.vue
Unescape Escape View File

@ -120,6 +120,7 @@
justify-content: space-between;
}
position: fixed;
z-index: 11;
bottom: 0;
background-color: #ffffff;
padding: 8px 20px;

26
src/views/baseinfo/infoclient/columns.tsx
Unescape Escape View File

@ -859,8 +859,8 @@ export const formSchema: FormSchema[] = [
colProps: { span: 4 },
},
{
label: '揽货人Name',
field: 'saleName',
label: '',
field: 'sale',
component: 'Input',
defaultValue: '',
show: false,
@ -883,25 +883,25 @@ export const formSchema: FormSchema[] = [
console.log(obj)
if (e && obj) {
formModel.saleId = obj.value
formModel.saleName = obj.label
formModel.sale = obj.label
}
if (!e && !obj) {
formModel.saleId = ''
formModel.saleName = ''
formModel.sale = ''
}
},
}
},
},
{
label: '操作人Name',
field: 'opName',
label: '',
field: 'operatorName',
component: 'Input',
defaultValue: '',
show: false,
},
{
field: 'op',
field: 'operator',
label: '操作人',
component: 'Select',
colProps: { span: 4 },
@ -917,19 +917,19 @@ export const formSchema: FormSchema[] = [
onChange: (e, obj) => {
console.log(obj)
if (e && obj) {
formModel.op = obj.value
formModel.opName = obj.label
formModel.operator = obj.value
formModel.operatorName = obj.label
}
if (!e && !obj) {
formModel.op = ''
formModel.opName = ''
formModel.operator = ''
formModel.operatorName = ''
}
},
}
},
},
{
label: '单证Name',
label: '',
field: 'docName',
component: 'Input',
defaultValue: '',
@ -964,7 +964,7 @@ export const formSchema: FormSchema[] = [
},
},
{
label: '客服Name',
label: '',
field: 'customerServiceName',
component: 'Input',
defaultValue: '',

2
src/views/operation/seaexport/detail/components/storageSpace.vue
Unescape Escape View File

@ -90,7 +90,7 @@
loading.value = true
BringInBookingSlotToOrder({ seaExportId: props.id, slots }).then(res => {
// createMessage.success(res.data)
emit('createTask', 'WAIT_BILL_CONFIRM')
emit('createTask', 'WAIT_SPACE_RELEASE')
visible.value = false
loading.value = false
}).catch(() => {

15
src/views/operation/seaexport/detail/index.vue
Unescape Escape View File

@ -41,7 +41,7 @@
<span v-show="isOpenSet" @click="openSetInfo"><span class="iconfont icon-jichupeizhi"></span>设置信息</span>
</div>
</div>
<div class="main-scorll">
<div class="main-scorll" :class="{ 'approve-main-scorll': !!route.query.taskId }">
<a-tabs v-model:activeKey="mainOrderActiveKey" class="ds-sea-child-tab">
<a-tab-pane key="1-1" tab="基础信息" size="small">
<basicInfo ref="RefbasicInfo" :details="bookingDetails"></basicInfo>
@ -107,20 +107,19 @@
</div>
</div>
<!-- 其他信息 -->
<transition name="slide" v-if="source == 'edit'">
<transition name="slide">
<otherInfo
class="sea-other-info"
v-if="source == 'edit'"
ref="OtherInfo"
:details="bookingDetails"
@openFlag="otherOpenFlag"
>
<Divider type="horizontal" />
<!-- 联系人信息 -->
<ContactList v-if="source == 'edit' && id" :id="id"></ContactList>
<ContactList :id="id"></ContactList>
</otherInfo>
</transition>
<transition name="slide" v-if="source == 'edit'">
<transition name="slide">
<rightContent
class="right-content"
ref="RefrightContent"
@ -497,6 +496,7 @@
loading.value = false
if (res.succeeded) {
if (postData.id) {
if (!!route.query.taskId) return
createMessage.success('保存成功!')
} else {
createMessage.success('新增成功!')
@ -848,6 +848,7 @@
}
// 订舱审核
const approveDc = (remark) => {
save()
const postData = {
result: remark ? 2 : 1,
ids: [id.value],
@ -898,6 +899,7 @@
}
.setting-flag {
position: absolute;
z-index: 1111;
right: 22px;
top: 10px;
>span {
@ -927,6 +929,9 @@
overflow-y: auto;
overflow-x: hidden;
}
.approve-main-scorll {
height: calc(100vh - 115px);
}
}
.line {
width: 100%;

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

@ -2442,6 +2442,12 @@ export const otherInfoFormSchema: FormSchema[] = [
component: 'Input',
show: false
},
{
field: 'saleDeptName',
label: '',
component: 'Input',
show: false
},
{
field: 'saleDeptId',
label: '所属部门',

22
src/views/operation/seaexport/detail/modules/basicInfo.vue
Unescape Escape View File

@ -183,17 +183,17 @@
}
)
onMounted(() => {
if (source.value != 'edit') {
basicInfoFormSchema.forEach(item => {
item.dynamicDisabled = true
})
} else {
basicInfoFormSchema.forEach(item => {
if (item.field != 'customerNo') {
item.dynamicDisabled = false
}
})
}
// if (source.value != 'edit') {
// basicInfoFormSchema.forEach(item => {
// item.dynamicDisabled = true
// })
// } else {
// basicInfoFormSchema.forEach(item => {
// if (item.field != 'customerNo') {
// item.dynamicDisabled = false
// }
// })
// }
const today = new Date()
const year = today.getFullYear() // 获取当前年份
let month = today.getMonth() + 1 // 获取当前月份，+1因为getMonth()返回0-11

42
src/views/operation/seaexport/detail/modules/cargoInfo.vue
Unescape Escape View File

@ -392,27 +392,27 @@
// 判断页面来源
const source = ref(route.query.source || 'edit')
onMounted(() => {
if (source.value != 'edit') {
cargoInfoFormSchema1.forEach(item => {
item.dynamicDisabled = true
})
cargoInfoFormSchema2.forEach(item => {
item.dynamicDisabled = true
})
cargoInfoFormSchema3.forEach(item => {
item.dynamicDisabled = true
})
} else {
cargoInfoFormSchema1.forEach(item => {
item.dynamicDisabled = false
})
cargoInfoFormSchema2.forEach(item => {
item.dynamicDisabled = false
})
cargoInfoFormSchema3.forEach(item => {
item.dynamicDisabled = false
})
}
// if (source.value != 'edit') {
// cargoInfoFormSchema1.forEach(item => {
// item.dynamicDisabled = true
// })
// cargoInfoFormSchema2.forEach(item => {
// item.dynamicDisabled = true
// })
// cargoInfoFormSchema3.forEach(item => {
// item.dynamicDisabled = true
// })
// } else {
// cargoInfoFormSchema1.forEach(item => {
// item.dynamicDisabled = false
// })
// cargoInfoFormSchema2.forEach(item => {
// item.dynamicDisabled = false
// })
// cargoInfoFormSchema3.forEach(item => {
// item.dynamicDisabled = false
// })
// }
})
function SetTOTALNO(SS) {
let DSS = SS.toString()

10
src/views/operation/seaexport/detail/modules/ediMore.vue
Unescape Escape View File

@ -61,11 +61,11 @@
// props.details[type] = value || ''
// }
onMounted(() => {
if (source.value != 'edit') {
ediMoreFormSchema.forEach(item => {
item.dynamicDisabled = true
})
}
// if (source.value != 'edit') {
// ediMoreFormSchema.forEach(item => {
// item.dynamicDisabled = true
// })
// }
})
defineExpose({
// RefediFrom,

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

@ -253,7 +253,7 @@
isLockBooking: { type: Boolean, default: false },
})
// 判断页面进入源
const source = route.query.source || 'edit'
const source = 'edit'
const emit = defineEmits([
'changectnall',
'changeDetail',

36
src/views/operation/seaexport/detail/modules/mailingInfo.vue
Unescape Escape View File

@ -279,24 +279,24 @@
)
onMounted(() => {
// 控制非编辑页面禁用输入框
if (source.value != 'edit') {
mailingInfoFormSchemaR.forEach(item => {
item.dynamicDisabled = true
})
} else {
mailingInfoFormSchemaR.forEach(item => {
item.dynamicDisabled = false
})
}
if (source.value != 'edit') {
mailingInfoFormSchemaL.forEach(item => {
item.dynamicDisabled = true
})
} else {
mailingInfoFormSchemaL.forEach(item => {
item.dynamicDisabled = false
})
}
// if (source.value != 'edit') {
// mailingInfoFormSchemaR.forEach(item => {
// item.dynamicDisabled = true
// })
// } else {
// mailingInfoFormSchemaR.forEach(item => {
// item.dynamicDisabled = false
// })
// }
// if (source.value != 'edit') {
// mailingInfoFormSchemaL.forEach(item => {
// item.dynamicDisabled = true
// })
// } else {
// mailingInfoFormSchemaL.forEach(item => {
// item.dynamicDisabled = false
// })
// }
})
defineExpose({
// RefmailingFrom,

10
src/views/operation/seaexport/detail/modules/noteInfo.vue
Unescape Escape View File

@ -40,11 +40,11 @@
}
)
onMounted(() => {
if (source.value != 'edit') {
noteFormSchema.forEach(item => {
item.dynamicDisabled = true
})
}
// if (source.value != 'edit') {
// noteFormSchema.forEach(item => {
// item.dynamicDisabled = true
// })
// }
})
defineExpose({
// RefediFrom,

16
src/views/operation/seaexport/detail/modules/otherInfo.vue
Unescape Escape View File

@ -4,7 +4,7 @@
* @Date: 2024-04-29 11:54:04
-->
<template>
<div class="other-info" v-show="flag">
<div class="other-info" :class="{ 'check-other-info': route.query.taskId }" v-show="flag">
<div class="ds-card">
<h4 class="flex">
<span>其他信息</span>
@ -60,6 +60,8 @@
import { useMessage } from '/@/hooks/web/useMessage'
import { getDictOption } from '/@/utils/dictUtil'
import { Divider } from 'ant-design-vue'
import { useRoute } from 'vue-router'
const route = useRoute()
// 装运方式字典
const FnblType = ref([])
getDictOption('bl_type').then((res) => {
@ -137,12 +139,9 @@
}
})
emitter.on('customerBack', (v) => {
console.log(v)
if (v.laneId) {
setFieldsValue({
...v
})
}
setFieldsValue({
...v
})
})
})
defineExpose({
@ -214,4 +213,7 @@
.other-info:hover {
overflow-y: auto;
}
.check-other-info {
top: -1px;
}
</style>

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

@ -1,5 +1,5 @@
<template>
<div class="ds-sea-right-content" v-show="flag">
<div class="ds-sea-right-content" :class="{ 'ds-check-sea-right-content': !!route.query.taskId }" v-show="flag">
<div class="ds-card">
<h4 class="flex">
<span>设置信息</span>
@ -1328,4 +1328,7 @@
.ds-sea-right-content {
overflow-y: auto;
}
.ds-check-sea-right-content {
top: -1px;
}
</style>

Write Preview
Loading…
Cancel
Save