diff --git a/src/assets/icons/history.svg b/src/assets/icons/history.svg new file mode 100644 index 00000000..15a8a8ce --- /dev/null +++ b/src/assets/icons/history.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/src/assets/icons/提交.svg b/src/assets/icons/submit1.svg similarity index 100% rename from src/assets/icons/提交.svg rename to src/assets/icons/submit1.svg diff --git a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue index cf72820e..838ba7db 100644 --- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue +++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue @@ -17,10 +17,10 @@ - + - + diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx index d93b8011..2ac4a35e 100644 --- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx +++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx @@ -1234,8 +1234,8 @@ export const noteFormSchema: FormSchema[] = [ api: GetClientFrtSelectList, allowClear: true, showSearch: true, - labelField: 'cnName', - valueField: 'cnName', + labelField: 'frtName', + valueField: 'frtName', resultField: 'data', immediate: false, filterOption: (input: string, option: any) => { diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue index e32d269a..ef3d3820 100644 --- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue +++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue @@ -366,7 +366,7 @@ }, 0) } const filterOption = (input, option) => { - return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0; + return option.ctnName.toLowerCase().indexOf(input.toLowerCase()) >= 0; } const [ registerForm4, diff --git a/src/views/operation/seaexport/detail/modules/goodsTable.vue b/src/views/operation/seaexport/detail/modules/goodsTable.vue index 8a986b02..30e16b72 100644 --- a/src/views/operation/seaexport/detail/modules/goodsTable.vue +++ b/src/views/operation/seaexport/detail/modules/goodsTable.vue @@ -325,7 +325,7 @@ type: 'dropdown', // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { - const res = ctnDict.value.length ? ctnDict.value : (await GetCtnSelectList())?.data + const res = (await GetCtnSelectList({ queryKey: query }))?.data if (!ctnDict.value.length) ctnDict.value = res const dict = res.map((res) => { return res.ctnName @@ -372,7 +372,6 @@ // 下拉框数据,可以同步或者异步返回(异步需要process返回) source: async (query, process) => { const res = (await GetPackageSelectList({ queryKey: query }))?.data - console.log(res) mainPkgs.value = res const dict = res.map((res) => { return res.packageName diff --git a/src/views/operation/seaexport/detail/modules/mailingInfo.vue b/src/views/operation/seaexport/detail/modules/mailingInfo.vue index 637e150e..e10225a3 100644 --- a/src/views/operation/seaexport/detail/modules/mailingInfo.vue +++ b/src/views/operation/seaexport/detail/modules/mailingInfo.vue @@ -278,6 +278,13 @@ { deep: true } ) onMounted(() => { + emitter.on('customerBack', (v) => { + if (v.blContent) { + setFieldsValueL({ + shipperContent: v.blContent + }) + } + }) // 控制非编辑页面禁用输入框 // if (source.value != 'edit') { // mailingInfoFormSchemaR.forEach(item => {