diff --git a/src/api/setting/account.ts b/src/api/setting/account.ts new file mode 100644 index 00000000..c896a79a --- /dev/null +++ b/src/api/setting/account.ts @@ -0,0 +1,55 @@ +import request from '@/utils/request' + +const v = "1.0"; + +export function accountList(query: any) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.account.list', + v, + timestamp: new Date().getTime(), + }, + data: query || {} + }) +} + +export function accountAdd(data: any) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.account.add', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function accountdelete(data: { employee_id: number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.account.delete', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function accountUpdate(data: { employee_id: number, real_name?: string, file_id?: number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.account.update', + v, + timestamp: new Date().getTime() + }, + data + }) +} \ No newline at end of file diff --git a/src/api/stock.ts b/src/api/stock.ts index 9f61752d..5470b535 100644 --- a/src/api/stock.ts +++ b/src/api/stock.ts @@ -30,6 +30,7 @@ export function getProhibitedType() { } as any) } +// 未使用,获取违禁品(限制品)列表 export function getProhibitedList() { return request({ url: '/system', @@ -198,19 +199,19 @@ export function createUnit(data: any) { } as any) } -export function getBoxUnits() { - return request({ - url: '/system', - method: 'post', - params: { - method: 'stock.warehouse.getBoxUnits', - v, - timestamp: new Date().getTime() - }, - data: {}, - isSystemApi: true - } as any) -} +// export function getBoxUnits() { +// return request({ +// url: '/system', +// method: 'post', +// params: { +// method: 'stock.warehouse.getBoxUnits', +// v, +// timestamp: new Date().getTime() +// }, +// data: {}, +// isSystemApi: true +// } as any) +// } export function checkItemCodeUnique(data: any) { return request({ @@ -310,6 +311,7 @@ export function deleteProhibited(data: any) { } as any) } +// 未使用,在库存日志或历史记录组件中,用于执行“回退”到某个历史状态的操作 export function backData(data: any) { return request({ url: '/system', @@ -323,3 +325,18 @@ export function backData(data: any) { isSystemApi: true } as any) } + +// 已弃用 +// export function warehouseSearch(data:any) { +// return request({ +// url: '/system', +// method: 'post', +// params: { +// method: 'stock.warehouse.search', +// v, +// timestamp: new Date().getTime() +// }, +// data: data, +// isSystemApi: true +// } as any) +// } \ No newline at end of file diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue index 098b057c..e6d984b9 100644 --- a/src/components/ImagesUpload/index.vue +++ b/src/components/ImagesUpload/index.vue @@ -251,9 +251,18 @@ const uploadAllFiles = async () => { file.status = 'uploading' const result = await uploadFile(file) - file.url = result.fileUrl - file.uid = result.fileId - file.status = 'success' + // 注意:这里需要根据后端返回的结构来映射 + // 如果后端返回的是 { success: true },那么 result 可能没有 fileUrl 和 fileId + // 这种情况下,可能需要重新 loadImages 或者等待后端返回完整信息 + if (result && result.fileUrl) { + file.url = result.fileUrl + file.uid = result.fileId + file.status = 'success' + } else if (result && result.success) { + // 如果后端只返回了 success: true,说明上传通知成功 + // 我们标记为成功,但可能需要刷新列表来获取真实的 file_id + file.status = 'success' + } } catch (error: any) { file.status = 'fail' ElMessage.error(error.message || '上传失败') @@ -292,8 +301,8 @@ const uploadFile = async (file: any) => { throw new Error(`上传失败: ${response.status}`) } - const { data } = await indexApi.uploadSuccessNotify(cosConfig.fileInfo || cosConfig) // 注意这里可能需要根据实际接口返回调整 - return data + const { data: resultData } = await indexApi.uploadSuccessNotify(cosConfig.fileInfo || cosConfig) + return resultData } const getCOSUploadConfig = async (file: File) => { @@ -494,6 +503,12 @@ const handleReset = () => { capturedImage.value = null stopCamera() } + +// 暴露给父组件,方便父组件在关闭弹窗等环节主动停止摄像头 +defineExpose({ + stopCamera, + handleReset +}) diff --git a/src/views/order/orderManagement/component/log.vue b/src/views/order/orderManagement/component/log.vue index dc7c1b2c..a376f6e0 100644 --- a/src/views/order/orderManagement/component/log.vue +++ b/src/views/order/orderManagement/component/log.vue @@ -1,7 +1,13 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 3904a295..ae7e2853 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -98,29 +98,31 @@ -
-
- - - - -
+
+ -
-
-

请从上方列表中选择一项查看详情

+
+
+

请从上方列表中选择一项查看详情

+
@@ -481,7 +483,7 @@ function handleDeliveryPrintOperation(command: string) { } .lower-level { - flex: 1; + height: 40%; display: flex; flex-direction: column; border-top: 1px solid #ebeef5; @@ -497,18 +499,16 @@ function handleDeliveryPrintOperation(command: string) { .detail-container { flex: 1; overflow: auto; - padding: 10px; } - } - .no-selection { - flex: 1; - display: flex; - align-items: center; - justify-content: center; - color: #909399; - background-color: #fff; - .empty-tip { text-align: center; } + .no-selection { + flex: 1; + display: flex; + align-items: center; + justify-content: center; + color: #909399; + .empty-tip { text-align: center; } + } } } } diff --git a/src/views/order/orderManagement/styles/order-sub.scss b/src/views/order/orderManagement/styles/order-sub.scss index fd8b2f17..6539973f 100644 --- a/src/views/order/orderManagement/styles/order-sub.scss +++ b/src/views/order/orderManagement/styles/order-sub.scss @@ -50,7 +50,7 @@ } .lower-level { - flex: 1; + height: 40%; display: flex; flex-direction: column; border-top: 1px solid #ebeef5; @@ -66,7 +66,6 @@ .detail-container { flex: 1; overflow: auto; - padding: 10px; } } diff --git a/src/views/stock/stock/component/add.vue b/src/views/stock/stock/component/add.vue index 616e1dbb..d97960f3 100644 --- a/src/views/stock/stock/component/add.vue +++ b/src/views/stock/stock/component/add.vue @@ -281,6 +281,7 @@ import { ref, reactive, watch, onMounted, nextTick } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import { Check, Refresh, InfoFilled, Plus } from '@element-plus/icons-vue' import * as stockApi from '@/api/stock' +import { stockDefaultFormData, stockFormRules } from '../stock-config' const props = defineProps({ id: { @@ -314,39 +315,7 @@ const newUnitName = ref('') const newProhibitedName = ref('') const newProhibitedLevel = ref(1) -const formData = reactive({ - item_code: '', - store_id: undefined as number | undefined, - barcode: '', - item_name: '', - sku_property: '', - stock_unit: '', - packing_requirements: '', - length: 0.00, - width: 0.00, - height: 0.00, - volume: 0.00, - gross_weight: 0, - net_weight: 0, - tag_price: 0.00, - retail_price: 0.00, - is_sn_mgmt: 'N', - is_shelf_life_mgmt: 'N', - is_batch_mgmt: 'N', - prohibited_id: undefined as number | undefined, - brand_name: '', - managementFlags: [] as string[], - // Box specs - enable_box_spec: false, - quantity_per_box: 0, - box_gross_weight: 0, - box_net_weight: 0, - box_length: 0.00, - box_width: 0.00, - box_height: 0.00, - box_volume: 0.00, - box_unit: '' -}) +const formData = reactive(JSON.parse(JSON.stringify(stockDefaultFormData))) const originalData = reactive({}) @@ -415,21 +384,8 @@ const validateItemCode = async (rule: any, value: any, callback: any) => { } const formRules = { - store_id: [{ required: true, message: '货主不能为空', trigger: 'change' }], - barcode: [{ required: true, message: '条码不能为空', trigger: 'blur' }], + ...stockFormRules, item_code: [{ validator: validateItemCode, trigger: 'blur' }], - item_name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }], - stock_unit: [{ required: true, message: '库存单位不能为空', trigger: 'change' }], - gross_weight: [ - { required: true, message: '毛重不能为空', trigger: 'blur' }, - { - validator: (rule: any, value: any, callback: any) => { - if (value < 0) callback(new Error('毛重不能小于0')) - else callback() - }, - trigger: 'blur' - } - ], quantity_per_box: [ { validator: (rule: any, value: any, callback: any) => { diff --git a/src/views/stock/stock/component/barcode.vue b/src/views/stock/stock/component/barcode.vue index ec627436..83b59513 100644 --- a/src/views/stock/stock/component/barcode.vue +++ b/src/views/stock/stock/component/barcode.vue @@ -1,6 +1,6 @@