diff --git a/oaLogin.html b/oaLogin.html new file mode 100644 index 0000000..7c8f80f --- /dev/null +++ b/oaLogin.html @@ -0,0 +1,52 @@ + + + + +oa登录 + + + + + + + + \ No newline at end of file diff --git a/src/api/system/dept.js b/src/api/system/dept.js index fc2f0ad..7bf3f68 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -41,6 +41,13 @@ export const add = row => { }); }; +export const syncIamOrganizations = () => { + return request({ + url: '/blade-system/dept/sync-iam-organizations', + method: 'post', + }); +}; + export const update = row => { return request({ url: '/blade-system/dept/submit', diff --git a/src/docker/nginx.conf b/src/docker/nginx.conf new file mode 100644 index 0000000..0155f82 --- /dev/null +++ b/src/docker/nginx.conf @@ -0,0 +1,19 @@ +server { + listen 80; + server_name localhost; + root /usr/share/nginx/html; + index index.html; + + gzip on; + gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + location /assets/ { + add_header Cache-Control "public, max-age=31536000, immutable"; + try_files $uri =404; + } + + location / { + add_header Cache-Control "no-store, no-cache, must-revalidate"; + try_files $uri $uri/ /index.html; + } +} diff --git a/src/views/business/components/shipping-template-page.vue b/src/views/business/components/shipping-template-page.vue index 323d15c..3b33a8f 100644 --- a/src/views/business/components/shipping-template-page.vue +++ b/src/views/business/components/shipping-template-page.vue @@ -2027,8 +2027,8 @@ export default { delete detail.updateUser; delete detail.updateUserName; delete detail.status; - // 模板名称追加「副本」 - detail.templateName = `${detail.templateName || ''}副本`; + // 模板名称追加「-副本」 + detail.templateName = `${detail.templateName || ''}-副本`; console.log('处理后的数据:', detail); console.log('isStandaloneBusinessPage:', this.isStandaloneBusinessPage); diff --git a/src/views/business/components/waybill-import-dialog.vue b/src/views/business/components/waybill-import-dialog.vue index 33585a8..57dc3a0 100644 --- a/src/views/business/components/waybill-import-dialog.vue +++ b/src/views/business/components/waybill-import-dialog.vue @@ -10,107 +10,200 @@ :class="{ 'waybill-import-page': standalone }" @closed="handleClosed" > -
-
- - - + +
+ + + + + + - + + + + - + + + + - -
- 查询重置 + :value="item.id" + /> + +
-
-
- 新建导入 + 查询 + 重置 +
+ + +
+
+ 新建导入 + 批量删除
+
+ + + + +
- - - - - - - + - + + + + - - - + + + + + + + + +
+ +
+ + + + + {{ item.label }} + + + + + 查询 + + + - - +
+ +
emit('closed'); const createVisible = ref(props.createPage), detailVisible = ref(false), formRef = ref(); +const searchVisible = ref(true); +const columnSettingVisible = ref(false); +const tableSize = ref('default'); +const tableSizeOptions = ['default', 'large', 'small']; +const columnOptions = [ + { prop: 'batchNo', label: '运单批次号' }, + { prop: 'projectName', label: '项目名称' }, + { prop: 'carrierName', label: '承运商' }, + { prop: 'carrierType', label: '承运类型' }, + { prop: 'waybillCount', label: '运单数' }, + { prop: 'importTypeName', label: '导入方式' }, + { prop: 'createUserName', label: '创建人' }, + { prop: 'statusName', label: '状态' }, + { prop: 'createTime', label: '创建时间' }, + { prop: 'updateTime', label: '更新时间' }, +]; +const visibleColumnKeys = ref(columnOptions.map(item => item.prop)); +const columnVisible = computed(() => + Object.fromEntries(columnOptions.map(item => [item.prop, visibleColumnKeys.value.includes(item.prop)])) +); +const toggleTableSize = () => { + const index = tableSizeOptions.indexOf(tableSize.value); + tableSize.value = tableSizeOptions[(index + 1) % tableSizeOptions.length]; +}; const query = reactive({ batchNo: '', carrierId: '', createUser: '', createTimeRange: [] }); -const detailQuery = reactive({ vehicleNo: '', cargoName: '' }); +const detailQuery = reactive({ vehicleNo: '', driverName: '' }); const createDefaultForm = () => ({ id: '', batchNo: '', @@ -862,6 +985,20 @@ const loadEditorOptions = async () => { cargoTypeFlatOptions.value = flattenCargoTypeOptions(cargoTypeOptions.value); driverOptions.value = extractRecords(driverRes); }; +const ensureTransportTypeOptions = async () => { + if (transportTypeOptions.value.length) return; + const dictRes = await getDictionary({ code: 'transport_type' }); + transportTypeOptions.value = extractRecords(dictRes).map(item => ({ + label: item.dictValue || item.label, + value: item.dictKey || item.value, + })); +}; +const transportTypeLabel = value => { + if (value === null || value === undefined || value === '') return '-'; + return ( + transportTypeOptions.value.find(item => String(item.value) === String(value))?.label || value + ); +}; const loadBatches = async () => { const res = await api.getImportBatches({ ...query, current: page.current, size: page.size }); batches.value = res.data?.data?.records || []; @@ -922,9 +1059,13 @@ const closeCreate = () => { } createVisible.value = false; }; -const openDetail = row => { +const openDetail = async row => { detailQuery.batchId = row.id; + detailQuery.vehicleNo = ''; + detailQuery.driverName = ''; + detailPage.current = 1; detailVisible.value = true; + await ensureTransportTypeOptions(); loadDetails(); }; // 草稿明细已落库为草稿运单，编辑时回填到明细表，避免重新上传附件。 @@ -1329,34 +1470,81 @@ const confirmImport = async () => { diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue index aac5268..edad1f7 100644 --- a/src/views/system/dept.vue +++ b/src/views/system/dept.vue @@ -22,6 +22,14 @@ @tree-load="treeLoad" >