From 4659436c07061aea9a336c83ccb106e677d9585c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 25 六月 2025 09:58:17 +0800
Subject: [PATCH] 1.销售出库-表单修改
---
src/views/salesOutbound/index.vue | 2 +-
src/views/salesOutbound/components/formDia.vue | 21 ++++++++-------------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/views/salesOutbound/components/formDia.vue b/src/views/salesOutbound/components/formDia.vue
index 8b24c5a..1e264dd 100644
--- a/src/views/salesOutbound/components/formDia.vue
+++ b/src/views/salesOutbound/components/formDia.vue
@@ -36,9 +36,9 @@
<el-select v-model="form.coalId" placeholder="璇烽�夋嫨鐓ょ" @change="setInfo">
<el-option
v-for="item in coalOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ :key="item.id"
+ :label="item.coal"
+ :value="item.id"
/>
</el-select>
</el-form-item>
@@ -56,14 +56,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍗曚环(鍚◣)" prop="priceIncludingTax">
+ <el-form-item label="鍗曚环(鍚◣)" prop="priceIncludingTax" @change="mathProfit">
<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="saleQuantity">
+ <el-form-item label="閿�鍞暟閲�" prop="saleQuantity" @change="mathProfit">
<el-input v-model="form.saleQuantity" placeholder="璇疯緭鍏ラ攢鍞暟閲�" maxlength="30" type="number" />
</el-form-item>
</el-col>
@@ -122,9 +122,8 @@
<script setup>
import {reactive, ref} from "vue";
-import {addOrEditSalesRecord, customerList, officialList} from "../../../api/salesOutbound/index.js";
+import {addOrEditSalesRecord, customerList, officialList} from "@/api/salesOutbound/index.js";
import useUserStore from '@/store/modules/user'
-import {getCoalInfoList, getSupplyList} from "@/api/procureMent/index.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits()
@@ -163,18 +162,14 @@
form.value.saleDate = proxy.getCurrentDate()
const [supplyRes, coalRes] = await Promise.all([
customerList(),
- getCoalInfoList(),
+ officialList(),
]);
let supplyData = supplyRes.data;
- let coalData = coalRes.data;
+ coalOptions.value = coalRes.data;
customerOptions.value = supplyData.map((item) => ({
value: item.id,
label: item.customerName,
}));
- coalOptions.value = coalData.map((item) => ({
- value: item.id,
- label: item.coal,
- }))
let res = await userStore.getInfo()
form.value.registrantId = res.user.userId
form.value.taxCoal = 13
diff --git a/src/views/salesOutbound/index.vue b/src/views/salesOutbound/index.vue
index fd6920e..09430b9 100644
--- a/src/views/salesOutbound/index.vue
+++ b/src/views/salesOutbound/index.vue
@@ -56,7 +56,7 @@
@selection-change="handleSelectionChange"
:show-selection="true"
:border="true"
- style="width: 100%;height: calc(100vh - 28em)"
+ style="width: 100%;height: calc(100vh - 30em)"
@edit="openDia"></ETable>
</div>
<pagination
--
Gitblit v1.9.3