From fb33ed0dcc183db8d72fcdfc831a137150797ee2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 03 七月 2025 17:09:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/inventoryManagement/receiptManagement/index.vue | 139 ++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 84 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 7d5caec..8f492ad 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -26,10 +26,10 @@
<el-table-column label="瑙勬牸鍨嬪彿" prop="projectName" width="160" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="contractAmount" width="70" show-overflow-tooltip />
<el-table-column label="鍏ュ簱鏁伴噺" prop="entryPersonName" width="90" show-overflow-tooltip />
- <el-table-column label="鍚◣鍗曚环" prop="entryDate" width="100" show-overflow-tooltip />
- <el-table-column label="鍚◣鎬讳环" prop="executionDate" width="100" show-overflow-tooltip />
+ <el-table-column label="鍚◣鍗曚环(鍏�)" prop="entryDate" width="100" show-overflow-tooltip />
+ <el-table-column label="鍚◣鎬讳环(鍏�)" prop="executionDate" width="100" show-overflow-tooltip />
<el-table-column label="绋庣巼(%)" prop="executionDate" width="80" show-overflow-tooltip />
- <el-table-column label="涓嶅惈绋庢�讳环" prop="executionDate" width="100" show-overflow-tooltip />
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="executionDate" width="180" show-overflow-tooltip />
<el-table-column label="鍏ュ簱浜�" prop="executionDate" width="80" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
@@ -43,84 +43,51 @@
<el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍏ュ簱' : '缂栬緫鍏ュ簱'" width="70%"
@close="closeDia">
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="salesContractNo">
+ <el-form-item label="閲囪喘璁㈠崟鍙�" prop="salesContractNo">
<el-input v-model="form.salesContractNo" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浜у搧澶х被锛�" prop="salesman">
- <el-select v-model="form.salesman" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
- :value="item.nickName" />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="customerContractNo">
- <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍗曚綅锛�" prop="customerId">
- <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鍏ュ簱鏃堕棿锛�" prop="projectName">
- <el-date-picker style="width: 100%" v-model="form.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
- type="date" placeholder="璇烽�夋嫨" clearable />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍏ュ簱鎵规锛�" prop="entryPerson">
- <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鍏ュ簱鏁伴噺锛�" prop="customerContractNo">
- <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍚◣鍗曚环锛�" prop="customerId">
- <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鍚◣鎬讳环锛�" prop="customerContractNo">
- <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="绋庣巼锛�" prop="customerId">
- <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="涓嶅惈绋庢�讳环锛�" prop="entryDate">
- <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍏ュ簱浜猴細" prop="entryPerson">
- <el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
+ <el-table
+ :data="productData"
+ border
+ @selection-change="productSelected"
+ >
+ <el-table-column align="center" type="selection" width="55" />
+ <el-table-column
+ align="center"
+ label="搴忓彿"
+ type="index"
+ width="60"
+ />
+ <el-table-column label="浜у搧澶х被" prop="productCategory" />
+ <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+ <el-table-column label="鍗曚綅" prop="unit" width="70" />
+ <el-table-column label="閲囪喘鏁伴噺" prop="quantity" width="100" />
+ <el-table-column label="寰呭叆搴撴暟閲�" prop="quantity0" width="100" />
+ <el-table-column label="鏈鍏ュ簱鏁伴噺" prop="quantityStock" width="120">
+ <template #default="scope">
+ <el-input v-model="scope.row.quantityStock" type="number" :min="0" :max="scope.row.quantity0" />
+ </template>
+ </el-table-column>
+ <el-table-column label="绋庣巼(%)" prop="taxRate" width="120" />
+ <el-table-column
+ label="鍚◣鍗曚环(鍏�)"
+ prop="taxInclusiveUnitPrice"
+ :formatter="formattedNumber"
+ width="150"
+ />
+ <el-table-column
+ label="鍚◣鎬讳环(鍏�)"
+ prop="taxInclusiveTotalPrice"
+ :formatter="formattedNumber"
+ width="150"
+ />
+ <el-table-column
+ label="涓嶅惈绋庢�讳环(鍏�)"
+ prop="taxExclusiveTotalPrice"
+ :formatter="formattedNumber"
+ width="150"
+ />
+ </el-table>
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -157,7 +124,6 @@
size: 100,
})
const total = ref(0)
-const fileList = ref([])
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref('')
@@ -260,7 +226,6 @@
form.value = { ...res }
form.value.entryPerson = Number(res.entryPerson)
productData.value = form.value.productData
- fileList.value = form.value.salesLedgerFiles
})
}
// let userAll = await userStore.getInfo()
@@ -284,9 +249,6 @@
return
}
let tempFileIds = []
- if (fileList.value.length > 0) {
- tempFileIds = fileList.value.map(item => item.tempId)
- }
form.value.tempFileIds = tempFileIds
form.value.type = 1
addOrUpdateSalesLedger(form.value).then(res => {
@@ -351,6 +313,15 @@
const day = String(today.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
}
+
+const productSelectedRows = ref([])
+const productSelected = (selectedRows) => {
+ productSelectedRows.value = selectedRows;
+};
+
+const formattedNumber = (row, column, cellValue) => {
+ return parseFloat(cellValue).toFixed(2);
+};
onMounted(() => {
getList()
})
--
Gitblit v1.9.3