diff --git a/dist.tar.gz b/dist.tar.gz index 2a4e5c5d..b446fc5b 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/storage/receiving.ts b/src/api/storage/receiving.ts index b01b93ce..9ad40fbe 100644 --- a/src/api/storage/receiving.ts +++ b/src/api/storage/receiving.ts @@ -70,6 +70,7 @@ export function batchCancelReceiving(data: any): Promise { // 发送打印任务 // data: { stationId, printerName, templateId, businessType, businessId, printData } +// 未使用 export function sendPrint(data: any) { return request({ url: '/system', @@ -112,110 +113,105 @@ export function createReceiving(data: any): Promise { // }) // } +// PDA项目使用,本项目不使用 +// export function addItem(data: any): Promise { +// return request({ +// url: '/system', +// method: 'post', +// params: { +// method: 'storage.receiving.addItem', +// v, +// timestamp: new Date().getTime() +// }, +// data: data +// }) +// } +// export function removeItem(data: any): Promise { +// return request({ +// url: '/system', +// method: 'post', +// params: { +// method: 'storage.receiving.removeItem', +// v, +// timestamp: new Date().getTime() +// }, +// data: data +// }) +// } +// export function saveReceiving(data: any): Promise { +// return request({ +// url: '/system', +// method: 'post', +// params: { +// method: 'storage.receiving.saveReceiving', +// v, +// timestamp: new Date().getTime() +// }, +// data: data +// }) +// } +// export function getReceiving(data: any): Promise { +// return request({ +// url: '/system', +// method: 'post', +// params: { +// method: 'storage.receiving.get', +// v, +// timestamp: new Date().getTime() +// }, +// data: data +// }) +// } +// export function addDetail(data: any): Promise { +// return request({ +// url: '/system', +// method: 'post', +// params: { +// method: 'storage.receiving.addDetail', +// v, +// timestamp: new Date().getTime() +// }, +// data: data +// }) +// } +// export function deleteDetail(data: any): Promise { +// return request({ +// url: '/system', +// method: 'post', +// params: { +// method: 'storage.receiving.deleteDetail', +// v, +// timestamp: new Date().getTime() +// }, +// data: data +// }) +// } +// export function detailChange(data: any): Promise { +// return request({ +// url: '/system', +// method: 'post', +// params: { +// method: 'storage.receiving.detailChange', +// v, +// timestamp: new Date().getTime() +// }, +// data: data +// }) +// } +// export function cancelReceivingDetail(data: any): Promise { +// return request({ +// url: '/system', +// method: 'post', +// params: { +// method: 'storage.receiving.cancel', +// v, +// timestamp: new Date().getTime() +// }, +// data: data +// }) +// } +// ------ -export function addItem(data: any): Promise { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.receiving.addItem', - v, - timestamp: new Date().getTime() - }, - data: data - }) -} - -export function removeItem(data: any): Promise { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.receiving.removeItem', - v, - timestamp: new Date().getTime() - }, - data: data - }) -} - -export function saveReceiving(data: any): Promise { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.receiving.saveReceiving', - v, - timestamp: new Date().getTime() - }, - data: data - }) -} - -export function getReceiving(data: any): Promise { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.receiving.get', - v, - timestamp: new Date().getTime() - }, - data: data - }) -} - -export function addDetail(data: any): Promise { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.receiving.addDetail', - v, - timestamp: new Date().getTime() - }, - data: data - }) -} - -export function deleteDetail(data: any): Promise { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.receiving.deleteDetail', - v, - timestamp: new Date().getTime() - }, - data: data - }) -} - -export function detailChange(data: any): Promise { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.receiving.detailChange', - v, - timestamp: new Date().getTime() - }, - data: data - }) -} - -export function cancelReceivingDetail(data: any): Promise { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.receiving.cancel', - v, - timestamp: new Date().getTime() - }, - data: data - }) -} export function completeReceiving(data: any): Promise { return request({ @@ -243,7 +239,6 @@ export function bindReceivingStore(data: any): Promise { data: data }) } - export function bindDetailProduct(data: any): Promise { return request({ url: '/system', diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue index 794fd114..83dc4f0e 100644 --- a/src/components/LangSelect/index.vue +++ b/src/components/LangSelect/index.vue @@ -55,5 +55,6 @@ const handleSetLanguage = (lang: string) => { } .lang-text { font-size: 14px; + color: aliceblue; } \ No newline at end of file diff --git a/src/components/ScanBox/index.vue b/src/components/ScanBox/index.vue index 118c017a..90ffacd7 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -223,7 +223,7 @@ v-for="option in field.options" :key="option.value" :label="option.label" - :value="option.value" + :value="option.value == null ? '' : option.value" /> @@ -236,7 +236,7 @@ 必填
-
@@ -269,9 +269,9 @@ style="width: 100%;" @change="handleCustomChange" > - - - + + + @@ -593,7 +593,7 @@ function normalizeTextValue(field: any) { } } -function initCustomConditions(fields: any[]) { +function initCustomConditions(fields: any[], isSilent = false) { fields.forEach(field => { let defaultValue: any = undefined let defaultOperator = '' @@ -603,8 +603,8 @@ function initCustomConditions(fields: any[]) { case 'multiple': defaultValue = field.multiple ? [] : undefined break - case 'boolean': - defaultValue = null + case 'boolean': + defaultValue = '' break case 'daterange': defaultValue = [] @@ -640,6 +640,12 @@ function initCustomConditions(fields: any[]) { customConditions[field.value].valueMax = undefined } }) + + if (isSilent) return + + if (props.autoSubmit) { + handleCustomChange() + } } function loadInitialConditions(conditions: any) { @@ -788,14 +794,11 @@ function filterNode(value: string, data: any) { } function handleReset() { - initCustomConditions(props.availableFields) + initCustomConditions(props.availableFields, true) activeCondition.value = null presetSearchText.value = '' filterPresetTree('') emit('reset') - if (props.autoSubmit) { - buildAndEmitCustomCondition() - } } function handleSubmit() { diff --git a/src/components/UpperTable/index.vue b/src/components/UpperTable/index.vue index 86edb6cb..954facf8 100644 --- a/src/components/UpperTable/index.vue +++ b/src/components/UpperTable/index.vue @@ -125,7 +125,7 @@ :total="total" :layout="paginationLayout" :background="paginationBackground" - :small="tableSize === 'small'" + :size="tableSize" @size-change="handlePageSizeChange" @current-change="handlePageChange" /> diff --git a/src/layout/component/Navbar.vue b/src/layout/component/Navbar.vue index fe6c5cb9..1f05784f 100644 --- a/src/layout/component/Navbar.vue +++ b/src/layout/component/Navbar.vue @@ -278,6 +278,11 @@ onMounted(() => { cursor: pointer; transition: background .3s; + .day-text, + .validity-text { + color: aliceblue; + } + &:hover { background: rgba(0, 0, 0, .025) } @@ -304,6 +309,7 @@ onMounted(() => { display: flex; align-items: center; .menu-text { + color: aliceblue; margin-left: 4px; } } @@ -316,6 +322,7 @@ onMounted(() => { position: relative; .user-name { + color: aliceblue; margin-right: 8px; font-weight: 500; } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 360d4b1e..3983c006 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -22,7 +22,7 @@