diff --git a/src/components/ApproveBtns/index.vue b/src/components/ApproveBtns/index.vue index b77ba3ad..e83b492f 100644 --- a/src/components/ApproveBtns/index.vue +++ b/src/components/ApproveBtns/index.vue @@ -120,6 +120,7 @@ justify-content: space-between; } position: fixed; + z-index: 11; bottom: 0; background-color: #ffffff; padding: 8px 20px; diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index 9717c93b..dff4da19 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -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: '', diff --git a/src/views/operation/seaexport/detail/components/storageSpace.vue b/src/views/operation/seaexport/detail/components/storageSpace.vue index bc36888a..6953cb3c 100644 --- a/src/views/operation/seaexport/detail/components/storageSpace.vue +++ b/src/views/operation/seaexport/detail/components/storageSpace.vue @@ -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(() => { diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue index f1cf3f32..a2d89e66 100644 --- a/src/views/operation/seaexport/detail/index.vue +++ b/src/views/operation/seaexport/detail/index.vue @@ -41,7 +41,7 @@ 设置信息 -
+
@@ -107,20 +107,19 @@
- + - + - + { + 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%; diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx index 1da90a3f..3f7dfd0c 100644 --- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx +++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx @@ -2442,6 +2442,12 @@ export const otherInfoFormSchema: FormSchema[] = [ component: 'Input', show: false }, + { + field: 'saleDeptName', + label: '', + component: 'Input', + show: false + }, { field: 'saleDeptId', label: '所属部门', diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue index e76438d4..fcc01521 100644 --- a/src/views/operation/seaexport/detail/modules/basicInfo.vue +++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue @@ -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 diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue index 78ec5415..185d4673 100644 --- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue +++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue @@ -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() diff --git a/src/views/operation/seaexport/detail/modules/ediMore.vue b/src/views/operation/seaexport/detail/modules/ediMore.vue index e3ff8e35..965678af 100644 --- a/src/views/operation/seaexport/detail/modules/ediMore.vue +++ b/src/views/operation/seaexport/detail/modules/ediMore.vue @@ -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, diff --git a/src/views/operation/seaexport/detail/modules/goodsTable.vue b/src/views/operation/seaexport/detail/modules/goodsTable.vue index 4fc02cc3..892ce448 100644 --- a/src/views/operation/seaexport/detail/modules/goodsTable.vue +++ b/src/views/operation/seaexport/detail/modules/goodsTable.vue @@ -253,7 +253,7 @@ isLockBooking: { type: Boolean, default: false }, }) // 判断页面进入源 - const source = route.query.source || 'edit' + const source = 'edit' const emit = defineEmits([ 'changectnall', 'changeDetail', diff --git a/src/views/operation/seaexport/detail/modules/mailingInfo.vue b/src/views/operation/seaexport/detail/modules/mailingInfo.vue index d2b289a0..e71e5fd4 100644 --- a/src/views/operation/seaexport/detail/modules/mailingInfo.vue +++ b/src/views/operation/seaexport/detail/modules/mailingInfo.vue @@ -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, diff --git a/src/views/operation/seaexport/detail/modules/noteInfo.vue b/src/views/operation/seaexport/detail/modules/noteInfo.vue index 2b607104..b466bee3 100644 --- a/src/views/operation/seaexport/detail/modules/noteInfo.vue +++ b/src/views/operation/seaexport/detail/modules/noteInfo.vue @@ -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, diff --git a/src/views/operation/seaexport/detail/modules/otherInfo.vue b/src/views/operation/seaexport/detail/modules/otherInfo.vue index f58a5e8e..ac2c701b 100644 --- a/src/views/operation/seaexport/detail/modules/otherInfo.vue +++ b/src/views/operation/seaexport/detail/modules/otherInfo.vue @@ -4,7 +4,7 @@ * @Date: 2024-04-29 11:54:04 -->