diff --git a/src/components/inventory/purchase/AddOrder.vue b/src/components/inventory/purchase/AddOrder.vue index 61b28c3..614d3c4 100644 --- a/src/components/inventory/purchase/AddOrder.vue +++ b/src/components/inventory/purchase/AddOrder.vue @@ -146,11 +146,12 @@ - + + + + + + @@ -193,6 +194,7 @@ import AddSupplier from "@/components/inventory/supplier/AddSupplier.vue"; import GoodsSearch from "@/components/inventory/GoodsSearch.vue"; import CheckoutDetail from "@/components/inventory/CheckoutDetail.vue"; import {Search} from "@element-plus/icons-vue"; +import TraceabilityCodeInput from "@/components/inventory/purchase/TraceabilityCodeInput.vue"; const orderForm = ref() const checkoutDetailRef = ref(false); @@ -321,6 +323,10 @@ let confirm = async () => { return } } + table_list.value.forEach((item: any) => { + console.log(item.traceabilityCodeList) + item.traceabilityCode= JSON.stringify(item.traceabilityCodeList) + }) let data = { inventoryOrder: JSON.parse(JSON.stringify(inventory_order_data.value)), inventoryOrderGoodsList: JSON.parse(JSON.stringify(table_list.value)) @@ -332,6 +338,7 @@ let confirm = async () => { }) } catch (error) { + console.log(error) ElMessage.warning('请填写完整必填项') } finally { isLoading.value = false diff --git a/src/components/inventory/purchase/TraceabilityCodeInput.vue b/src/components/inventory/purchase/TraceabilityCodeInput.vue new file mode 100644 index 0000000..0dc7896 --- /dev/null +++ b/src/components/inventory/purchase/TraceabilityCodeInput.vue @@ -0,0 +1,58 @@ + + + + + + + + + + {{ row.code.slice(0, 7) }} {{row.code.slice(7)}} + + + + + + + + + \ No newline at end of file diff --git a/src/views/social/accountRecords.vue b/src/views/social/accountRecords.vue index ff6859d..7532f18 100644 --- a/src/views/social/accountRecords.vue +++ b/src/views/social/accountRecords.vue @@ -22,8 +22,8 @@ 未对账 - {{ reconciliationResult[1] }} - {{ + {{ reconciliationResult[0] }} + {{ reconciliationResult[scope.row.reconciliationResult as keyof typeof reconciliationResult] || '未知状态' }} @@ -80,7 +80,10 @@ const accountRecordDo = (row: any) => { data.beginTime = selectDate.value[0]; data.endTime = selectDate.value[1]; post("social/reconciliation/totalDo", {data: data}).then((res: any) => { - ElMessage.success(res.stmtinfo.stmt_rslt_dscr); + ElMessage.success({ + message: res.stmtinfo.stmt_rslt_dscr, + duration: 8000 + }); row.reconciliationResult = res.stmtinfo.stmt_rslt }) }