From 8bffc8205125aa66253dd72dc509ba29f242a71b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 一月 2026 11:16:50 +0800
Subject: [PATCH] 进销存-升级 1.开票登记、来票登记改成绑定订单，不绑定开票
---
src/views/salesManagement/salesQuotation/index.vue | 98 ++----------------------------------------------
1 files changed, 5 insertions(+), 93 deletions(-)
diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index cefc769..0296517 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -61,13 +61,6 @@
楼{{ scope.row.totalAmount.toFixed(2) }}
</template>
</el-table-column>
-<!-- <el-table-column prop="status" label="鎶ヤ环鐘舵��" width="100">-->
-<!-- <template #default="scope">-->
-<!-- <el-tag :type="getStatusType(scope.row.status)">-->
-<!-- {{ scope.row.status }}-->
-<!-- </el-tag>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
<el-table-column label="鎿嶄綔" width="250" fixed="right" align="center">
<template #default="scope">
<el-button link type="primary" @click="handleView(scope.row)">鏌ョ湅</el-button>
@@ -88,7 +81,7 @@
</el-card>
<!-- 鏂板/缂栬緫瀵硅瘽妗� -->
- <el-dialog v-model="dialogVisible" :title="dialogTitle" width="1300px" :close-on-click-modal="false">
+ <FormDialog v-model="dialogVisible" :title="dialogTitle" width="80%" :close-on-click-modal="false" @close="dialogVisible = false" @confirm="handleSubmit" @cancel="dialogVisible = false">
<el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
<!-- 鍩烘湰淇℃伅 -->
<el-card class="form-card" shadow="never">
@@ -152,18 +145,6 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="浜よ揣鏈�" prop="deliveryPeriod">
- <el-date-picker
- v-model="form.deliveryPeriod"
- type="date"
- placeholder="閫夋嫨浜よ揣鏈�"
- style="width: 100%"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- />
- </el-form-item>
- </el-col>
</el-row>
</el-card>
@@ -207,11 +188,6 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="quantity" label="鏁伴噺">
- <template #default="scope">
- <el-input-number v-model="scope.row.quantity" :min="1" :precision="0" style="width: 100%" />
- </template>
- </el-table-column>
<el-table-column prop="unit" label="鍗曚綅">
<template #default="scope">
<el-input v-model="scope.row.unit" placeholder="鍗曚綅" />
@@ -219,12 +195,7 @@
</el-table-column>
<el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">
- <el-input-number v-model="scope.row.unitPrice" :min="0" :precision="2" style="width: 100%" @change="calculateAmount(scope.row)" />
- </template>
- </el-table-column>
- <el-table-column prop="amount" label="閲戦" width="120">
- <template #default="scope">
- <span>楼{{ scope.row.amount.toFixed(2) }}</span>
+ <el-input-number v-model="scope.row.unitPrice" :min="0" :precision="2" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="80" align="center">
@@ -233,47 +204,6 @@
</template>
</el-table-column>
</el-table>
- </el-card>
-
- <!-- 璐圭敤淇℃伅 -->
- <el-card class="form-card" shadow="never">
- <template #header>
- <span class="card-title">璐圭敤淇℃伅</span>
- </template>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item label="浜у搧灏忚">
- <el-input-number v-model="form.subtotal" :precision="2" :min="0" style="width: 100%" readonly />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="杩愯垂">
- <el-input-number v-model="form.freight" :precision="2" :min="0" style="width: 100%" @change="calculateTotal" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鍏朵粬璐圭敤">
- <el-input-number v-model="form.otherFee" :precision="2" :min="0" style="width: 100%" @change="calculateTotal" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item label="鎶樻墸鐜�(%)">
- <el-input-number v-model="form.discountRate" :precision="2" :min="0" :max="100" style="width: 100%" @change="calculateTotal" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鎶樻墸閲戦">
- <el-input-number v-model="form.discountAmount" :precision="2" :min="0" style="width: 100%" readonly />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鎶ヤ环鎬婚">
- <el-input-number v-model="form.totalAmount" :precision="2" :min="0" style="width: 100%" readonly />
- </el-form-item>
- </el-col>
- </el-row>
</el-card>
<!-- 澶囨敞淇℃伅 -->
@@ -286,13 +216,7 @@
</el-form-item>
</el-card>
</el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="handleSubmit">纭� 瀹�</el-button>
- </div>
- </template>
- </el-dialog>
+ </FormDialog>
<!-- 鏌ョ湅璇︽儏瀵硅瘽妗� -->
<el-dialog v-model="viewDialogVisible" title="鎶ヤ环璇︽儏" width="800px">
@@ -303,7 +227,6 @@
<el-descriptions-item label="鎶ヤ环鏃ユ湡">{{ currentQuotation.quotationDate }}</el-descriptions-item>
<el-descriptions-item label="鏈夋晥鏈熻嚦">{{ currentQuotation.validDate }}</el-descriptions-item>
<el-descriptions-item label="浠樻鏂瑰紡">{{ currentQuotation.paymentMethod }}</el-descriptions-item>
- <el-descriptions-item label="浜よ揣鏈�">{{ currentQuotation.deliveryPeriod }}</el-descriptions-item>
<!-- <el-descriptions-item label="鎶ヤ环鐘舵��">-->
<!-- <el-tag :type="getStatusType(currentQuotation.status)">{{ currentQuotation.status }}</el-tag>-->
<!-- </el-descriptions-item>-->
@@ -317,16 +240,10 @@
<el-table :data="currentQuotation.products" border style="width: 100%">
<el-table-column prop="product" label="浜у搧鍚嶇О" />
<el-table-column prop="specification" label="瑙勬牸鍨嬪彿" />
- <el-table-column prop="quantity" label="鏁伴噺" />
<el-table-column prop="unit" label="鍗曚綅" />
<el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">
楼{{ scope.row.unitPrice.toFixed(2) }}
- </template>
- </el-table-column>
- <el-table-column prop="amount" label="閲戦">
- <template #default="scope">
- 楼{{ scope.row.amount.toFixed(2) }}
</template>
</el-table-column>
</el-table>
@@ -345,6 +262,7 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import { Search } from '@element-plus/icons-vue'
import Pagination from '@/components/PIMTable/Pagination.vue'
+import FormDialog from '@/components/Dialog/FormDialog.vue'
import {getQuotationList,addQuotation,updateQuotation,deleteQuotation} from '@/api/salesManagement/salesQuotation.js'
import {userListNoPage} from "@/api/system/user.js";
import {customerList} from "@/api/salesManagement/salesLedger.js";
@@ -377,7 +295,6 @@
quotationDate: '',
validDate: '',
paymentMethod: '',
- deliveryPeriod: '',
status: '鑽夌',
remark: '',
products: [],
@@ -394,8 +311,7 @@
salesperson: [{ required: true, message: '璇烽�夋嫨涓氬姟鍛�', trigger: 'change' }],
quotationDate: [{ required: true, message: '璇烽�夋嫨鎶ヤ环鏃ユ湡', trigger: 'change' }],
validDate: [{ required: true, message: '璇烽�夋嫨鏈夋晥鏈�', trigger: 'change' }],
- paymentMethod: [{ required: true, message: '璇烽�夋嫨浠樻鏂瑰紡', trigger: 'change' }],
- deliveryPeriod: [{ required: true, message: '璇烽�夋嫨浜よ揣鏈�', trigger: 'change' }]
+ paymentMethod: [{ required: true, message: '璇烽�夋嫨浠樻鏂瑰紡', trigger: 'change' }]
}
const userList = ref([]);
const customerOption = ref([]);
@@ -545,7 +461,6 @@
quotationDate: row.quotationDate || '',
validDate: row.validDate || '',
paymentMethod: row.paymentMethod || '',
- deliveryPeriod: row.deliveryPeriod || '',
status: row.status || '',
remark: row.remark || '',
products: row.products ? row.products.map(product => ({
@@ -574,7 +489,6 @@
form.quotationDate = row.quotationDate || ''
form.validDate = row.validDate || ''
form.paymentMethod = row.paymentMethod || ''
- form.deliveryPeriod = row.deliveryPeriod || ''
form.status = row.status || '鑽夌'
form.remark = row.remark || ''
form.products = row.products ? row.products.map(product => ({
@@ -625,7 +539,6 @@
form.quotationDate = ''
form.validDate = ''
form.paymentMethod = ''
- form.deliveryPeriod = ''
form.status = '鑽夌'
form.remark = ''
form.products = []
@@ -746,7 +659,6 @@
quotationDate: item.quotationDate || '',
validDate: item.validDate || '',
paymentMethod: item.paymentMethod || '',
- deliveryPeriod: item.deliveryPeriod || '',
status: item.status || '鑽夌',
remark: item.remark || '',
products: item.products ? item.products.map(product => ({
--
Gitblit v1.9.3