From 9d9c62348e3296a597405e6f6416da8efc0fe18b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 12 六月 2025 10:29:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesOutbound/components/formDia.vue | 91 +++++++++++++++++++++++++++++++--------------
1 files changed, 63 insertions(+), 28 deletions(-)
diff --git a/src/views/salesOutbound/components/formDia.vue b/src/views/salesOutbound/components/formDia.vue
index 67e86df..d9d8059 100644
--- a/src/views/salesOutbound/components/formDia.vue
+++ b/src/views/salesOutbound/components/formDia.vue
@@ -2,12 +2,12 @@
<div>
<el-dialog :title="operationType === 'add' ? '鏂板鍑哄簱' : '缂栬緫鍑哄簱'"
v-model="dialogVisitable" width="800px" @close="cancel">
- <el-form :model="form" :rules="rules" ref="userRef" label-width="100px">
+ <el-form :model="form" :rules="rules" ref="formRef" label-width="120px">
<el-row>
<el-col :span="12">
- <el-form-item label="閿�鍞棩鏈�" prop="userName">
+ <el-form-item label="閿�鍞棩鏈�" prop="saleDate">
<el-date-picker
- v-model="form.userName"
+ v-model="form.saleDate"
type="date"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
@@ -18,8 +18,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀹㈡埛" prop="nickName">
- <el-select v-model="form.nickName" placeholder="璇烽�夋嫨瀹㈡埛">
+ <el-form-item label="瀹㈡埛" prop="customerId">
+ <el-select v-model="form.customerId" placeholder="璇烽�夋嫨瀹㈡埛">
<el-option
v-for="item in customerOptions"
:key="item.value"
@@ -32,8 +32,8 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鐓ょ" prop="type">
- <el-select v-model="form.nickName" placeholder="璇烽�夋嫨鐓ょ">
+ <el-form-item label="鐓ょ" prop="coalId">
+ <el-select v-model="form.coalId" placeholder="璇烽�夋嫨鐓ょ">
<el-option
v-for="item in typeOptions"
:key="item.value"
@@ -44,39 +44,56 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍗曚綅" prop="nickName">
- <el-input v-model="form.nickName" placeholder="璇疯緭鍏ュ崟浣�" maxlength="30" />
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" maxlength="30" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="閿�鍞暟閲�" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ラ攢鍞暟閲�" maxlength="30" type="number" />
+ <el-form-item label="搴撳瓨鏁伴噺" prop="inventoryQuantity">
+ <el-input v-model="form.inventoryQuantity" placeholder="璇疯緭鍏ラ攢鍞暟閲�" maxlength="30" type="number" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞崟浠�" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ラ攢鍞崟浠�(鍚◣)" maxlength="30" type="number" />
+ <el-form-item label="鍗曚环(鍚◣)" prop="priceIncludingTax">
+ <el-input v-model="form.priceIncludingTax" placeholder="璇疯緭鍏ラ攢鍞崟浠�(鍚◣)" maxlength="30" type="number" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="閿�鍞�讳环" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ラ攢鍞�讳环(鍚◣)" maxlength="30" type="number" />
+ <el-form-item label="閿�鍞暟閲�" prop="saleQuantity">
+ <el-input v-model="form.saleQuantity" placeholder="璇疯緭鍏ラ攢鍞暟閲�" maxlength="30" type="number" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐑��" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ儹鍊�" maxlength="30" />
+ <el-form-item label="閿�鍞崟浠�(鍚◣)" prop="salePrice">
+ <el-input v-model="form.salePrice" placeholder="璇疯緭鍏ラ攢鍞崟浠�(鍚◣)" maxlength="30" type="number" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鍒╂鼎" prop="userName">
- <el-input v-model="form.userName" placeholder="鍒╂鼎" maxlength="30" type="number" />
+ <el-form-item label="璐攢鐓ょ◣鐜�(%)" prop="taxCoal">
+ <el-input v-model="form.taxCoal" placeholder="璇疯緭鍏ラ攢鍞�讳环(鍚◣)" maxlength="30" type="number" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="杩愯緭绋庣巼(%)" prop="taxTrans">
+ <el-input v-model="form.taxTrans" placeholder="璇疯緭鍏ラ攢鍞�讳环(鍚◣)" maxlength="30" type="number" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="姣涘埄娑�" prop="grossProfit">
+ <el-input v-model="form.grossProfit" placeholder="姣涘埄娑�" maxlength="30" type="number" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍑�鍒╂鼎" prop="netProfit">
+ <el-input v-model="form.netProfit" placeholder="鍑�鍒╂鼎" maxlength="30" type="number" />
</el-form-item>
</el-col>
</el-row>
@@ -93,6 +110,7 @@
<script setup>
import {ref, reactive} from "vue";
+import {addOrEditSalesRecord, customerList} from "../../../api/salesOutbound/index.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits()
@@ -101,13 +119,23 @@
const customerOptions = ref([]) // 瀹㈡埛涓嬫媺妗�
const typeOptions = ref([]) // 鐓ょ涓嬫媺妗�
const data = reactive({
- form: {},
+ form: {
+ saleDate: '',
+ customerId: '',
+ coalId: '',
+ unit: '',
+ saleQuantity: '',
+ salePrice: '',
+ totalAmount: '',
+ taxCoal: '',
+ taxTrans: '',
+ grossProfit: '',
+ netProfit: '',
+ inventoryQuantity: '',
+ priceIncludingTax: '',
+ },
rules: {
- userName: [{ required: true, message: "鐧诲綍璐﹀彿涓嶈兘涓虹┖", trigger: "blur" },],
- nickName: [{ required: true, message: "鐢ㄦ埛濮撳悕涓嶈兘涓虹┖", trigger: "blur" }],
- roleIds: [{ required: true, message: "瑙掕壊涓嶈兘涓虹┖", trigger: "change" }],
- deptId: [{ required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" }],
- password: [{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, { min: 5, max: 20, message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "涓嶈兘鍖呭惈闈炴硶瀛楃锛�< > \" ' \\\ |", trigger: "blur" }],
+ saleDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" },],
}
})
@@ -117,18 +145,25 @@
const openDialog = (type, row) => {
console.log('openDialog', type, row)
dialogVisitable.value = true
+ form.value.saleDate = proxy.getCurrentDate()
+ customerList().then((res) => {
+ console.log(res)
+ })
}
// 鎻愪氦鍚堝苟琛ㄥ崟
const submitForm = () => {
- proxy.$refs["userRef"].validate(valid => {
+ proxy.$refs["formRef"].validate(valid => {
if (valid) {
-
+ addOrEditSalesRecord(form.value).then(() => {
+ cancel()
+ proxy.$modal.msgSuccess('鎻愪氦鎴愬姛')
+ })
}
})
}
// 鍏抽棴鍚堝苟琛ㄥ崟
const cancel = () => {
- proxy.resetForm("userRef")
+ proxy.resetForm("formRef")
dialogVisitable.value = false
emit('closeDia')
}
--
Gitblit v1.9.3