From 6a415a072a98d64d2f95d16eef73b6d7270b8d56 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 30 五月 2026 15:14:25 +0800
Subject: [PATCH] 新疆马铃薯 1.首页问题：挪新系统ui，需要确认一下页面数据完整。 2.协同办公：挪新系统 3.营销管理：客户往来取消回款金额字段，改为点击左侧客户时显示与该客户的所有订单信息，以及发货情况。销售可以选好对应的采购订单方便质量追溯。 4.采购管理：供应商往来同上逻辑，显示是否收货，也加上采购退货和采购报表功能。 5.采购加上设备备件选项，设备备件入库到备件库存。设备，仓储不足时做采购提醒。 6.仓储物流：得区分成品库和原料库（不存在半成品，成品只有一个产品，很好确认），原材料需要有批号，采集原料库需要做好仓库字段，让他们可以区分哪个仓库，然后把数采设备信息做一个实时的显示。总库存显示好当前存在的批次信息。 7.质量：只有不通过才需要填写对应的数据信息。在外侧做好选择通过不通过。过程，出厂检验无法对应到生产订单，那就对应到销售订单。 8.决策分析：基础数据分析和进销存分析，质量数据分析需要重新设计
---
src/views/procurementManagement/procurementLedger/index.vue | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 257 insertions(+), 32 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 2d42b57..8a6c27d 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -66,9 +66,9 @@
</div>
<div class="table_list">
<div style="display: flex;justify-content: flex-end;margin-bottom: 20px;">
- <el-button type="success"
- plain
- @click="handleBatchGenerate">鎵归噺鐢熸垚鏁版嵁</el-button>
+<!-- <el-button type="success"-->
+<!-- plain-->
+<!-- @click="handleBatchGenerate">鎵归噺鐢熸垚鏁版嵁</el-button>-->
<el-button type="primary"
@click="openForm('add')">鏂板鍙拌处</el-button>
<el-button type="primary"
@@ -103,12 +103,33 @@
label="搴忓彿"
type="index"
width="60" />
+ <el-table-column label="绫诲瀷"
+ prop="productType"
+ width="100">
+ <template #default="scope">
+ <el-tag :type="scope.row.productType === 2 ? 'warning' : 'success'" size="small">
+ {{ scope.row.productType === 2 ? '璁惧澶囦欢' : '浜у搧' }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="浜у搧澶х被"
prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿"
- prop="specificationModel" />
+ prop="specificationModel"
+ width="120">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">/</span>
+ <span v-else>{{ scope.row.specificationModel || '--' }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鍗曚綅"
- prop="unit" />
+ prop="unit"
+ width="100">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ scope.row.unit || '--' }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鍏ュ簱瀹℃牳鐘舵��"
prop="stockInApprovalStatus"
width="120">
@@ -120,22 +141,59 @@
</template>
</el-table-column>
<el-table-column label="鏁伴噺"
- prop="quantity" />
+ prop="quantity"
+ width="100" />
<el-table-column label="鍙敤鏁伴噺"
- prop="availableQuality" />
+ prop="availableQuality"
+ width="100">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ scope.row.availableQuality }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="閫�璐ф暟閲�"
- prop="returnQuality" />
+ prop="returnQuality"
+ width="100">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ scope.row.returnQuality }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="绋庣巼(%)"
- prop="taxRate" />
+ prop="taxRate"
+ width="100">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ scope.row.taxRate }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鍚◣鍗曚环(鍏�)"
prop="taxInclusiveUnitPrice"
- :formatter="formattedNumber" />
+ :formatter="formattedNumber"
+ width="130">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveUnitPrice) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鍚◣鎬讳环(鍏�)"
prop="taxInclusiveTotalPrice"
- :formatter="formattedNumber" />
+ :formatter="formattedNumber"
+ width="130">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveTotalPrice) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="涓嶅惈绋庢�讳环(鍏�)"
prop="taxExclusiveTotalPrice"
- :formatter="formattedNumber" />
+ :formatter="formattedNumber"
+ width="140">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ formattedNumber(null, null, scope.row.taxExclusiveTotalPrice) }}</span>
+ </template>
+ </el-table-column>
</el-table>
</template>
</el-table-column>
@@ -403,40 +461,86 @@
label="搴忓彿"
type="index"
width="60" />
+ <el-table-column label="绫诲瀷"
+ prop="productType"
+ width="100">
+ <template #default="scope">
+ <el-tag :type="scope.row.productType === 2 ? 'warning' : 'success'" size="small">
+ {{ scope.row.productType === 2 ? '璁惧澶囦欢' : '浜у搧' }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="浜у搧澶х被"
prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿"
- prop="specificationModel" />
+ prop="specificationModel"
+ width="120">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">/</span>
+ <span v-else>{{ scope.row.specificationModel || '--' }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鍗曚綅"
prop="unit"
- width="70" />
+ width="70">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ scope.row.unit || '--' }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鏁伴噺"
prop="quantity"
width="70" />
<el-table-column label="搴撳瓨棰勮鏁伴噺"
prop="warnNum"
width="120"
- show-overflow-tooltip />
+ show-overflow-tooltip>
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ scope.row.warnNum }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="绋庣巼(%)"
prop="taxRate"
- width="80" />
+ width="80">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ scope.row.taxRate }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鍚◣鍗曚环(鍏�)"
prop="taxInclusiveUnitPrice"
:formatter="formattedNumber"
- width="150" />
+ width="130">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveUnitPrice) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鍚◣鎬讳环(鍏�)"
prop="taxInclusiveTotalPrice"
:formatter="formattedNumber"
- width="150" />
+ width="130">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveTotalPrice) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="涓嶅惈绋庢�讳环(鍏�)"
prop="taxExclusiveTotalPrice"
:formatter="formattedNumber"
- width="150" />
+ width="140">
+ <template #default="scope">
+ <span v-if="scope.row.productType === 2">--</span>
+ <span v-else>{{ formattedNumber(null, null, scope.row.taxExclusiveTotalPrice) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鏄惁璐ㄦ"
prop="isChecked"
- width="150">
+ width="100">
<template #default="scope">
- <el-tag :type="scope.row.isChecked ? 'success' : 'info'">
+ <span v-if="scope.row.productType === 2">--</span>
+ <el-tag v-else :type="scope.row.isChecked ? 'success' : 'info'">
{{ scope.row.isChecked ? '鏄�' : '鍚�' }}
</el-tag>
</template>
@@ -533,9 +637,21 @@
ref="productFormRef">
<el-row :gutter="30">
<el-col :span="24">
+ <el-form-item label="绫诲瀷锛�"
+ prop="productType">
+ <el-radio-group v-model="productForm.productType" @change="handleProductTypeChange">
+ <el-radio :label="1">浜у搧</el-radio>
+ <el-radio :label="2">璁惧澶囦欢</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
<el-form-item label="浜у搧澶х被锛�"
prop="productId">
- <el-tree-select v-model="productForm.productId"
+ <el-tree-select v-if="productForm.productType !== 2"
+ v-model="productForm.productId"
placeholder="璇烽�夋嫨"
clearable
filterable
@@ -544,10 +660,22 @@
:data="productOptions"
:render-after-expand="false"
style="width: 100%" />
+ <el-select v-else
+ v-model="productForm.productId"
+ placeholder="璇烽�夋嫨璁惧澶囦欢"
+ filterable
+ clearable
+ @change="handleSparePartsChange"
+ style="width: 100%">
+ <el-option v-for="item in sparePartsOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
+ <el-row :gutter="30" v-if="productForm.productType !== 2">
<el-col :span="24">
<el-form-item label="瑙勬牸鍨嬪彿锛�"
prop="productModelId">
@@ -564,7 +692,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
+ <el-row :gutter="30" v-if="productForm.productType !== 2">
<el-col :span="12">
<el-form-item label="鍗曚綅锛�"
prop="unit">
@@ -588,7 +716,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
+ <el-row :gutter="30" v-if="productForm.productType !== 2">
<el-col :span="12">
<el-form-item label="鍚◣鍗曚环(鍏�)锛�"
prop="taxInclusiveUnitPrice">
@@ -615,7 +743,21 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
+ <el-row :gutter="30" v-if="productForm.productType === 2">
+ <el-col :span="24">
+ <el-form-item label="鏁伴噺锛�"
+ prop="quantity">
+ <el-input-number :step="0.1"
+ clearable
+ :precision="2"
+ :min="0"
+ style="width: 100%"
+ v-model="productForm.quantity"
+ placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30" v-if="productForm.productType !== 2">
<el-col :span="12">
<el-form-item label="鍚◣鎬讳环(鍏�)锛�"
prop="taxInclusiveTotalPrice">
@@ -655,7 +797,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12" v-if="productForm.productType !== 2">
<el-form-item label="搴撳瓨棰勮鏁伴噺锛�"
prop="warnNum">
<el-input-number v-model="productForm.warnNum"
@@ -667,7 +809,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
+ <el-row :gutter="30" v-if="productForm.productType !== 2">
<el-col :span="12">
<el-form-item label="鏄惁璐ㄦ锛�"
prop="isChecked">
@@ -740,6 +882,7 @@
const modelOptions = ref([]);
const userList = ref([]);
const productOptions = ref([]);
+ const sparePartsOptions = ref([]);
const salesContractList = ref([]);
const supplierList = ref([]);
const tableLoading = ref(false);
@@ -753,6 +896,7 @@
const fileList = ref([]);
import useUserStore from "@/store/modules/user";
import { modelList, productTreeList } from "@/api/basicData/product.js";
+ import { getSparePartsList } from "@/api/equipmentManagement/spareParts.js";
import dayjs from "dayjs";
import FileUpload from "@/components/AttachmentUpload/file/index.vue";
@@ -956,6 +1100,7 @@
const currentId = ref("");
const productFormData = reactive({
productForm: {
+ productType: 1,
productId: "",
productCategory: "",
productModelId: "",
@@ -987,10 +1132,27 @@
{ required: true, message: "璇疯緭鍏�", trigger: "blur" },
],
invoiceType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- isChecked: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ // isChecked 榛樿浼犲惁锛屼笉闇�瑕侀獙璇�
},
});
- const { productForm, productRules } = toRefs(productFormData);
+ const { productForm } = toRefs(productFormData);
+
+ // 鍔ㄦ�佽绠楅獙璇佽鍒�
+ const productRules = computed(() => {
+ const isSpareParts = productForm.value.productType === 2;
+ return {
+ productId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ productModelId: isSpareParts ? [] : [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ unit: isSpareParts ? [] : [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ taxInclusiveUnitPrice: isSpareParts ? [] : [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ taxRate: isSpareParts ? [] : [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ warnNum: isSpareParts ? [] : [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ taxInclusiveTotalPrice: isSpareParts ? [] : [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ taxExclusiveTotalPrice: isSpareParts ? [] : [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ invoiceType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ };
+ });
const upload = reactive({
// 涓婁紶鐨勫湴鍧�
url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
@@ -1472,16 +1634,27 @@
await nextTick();
if (type === "add") {
- productForm.value.isChecked = false;
+ productForm.value.isChecked = false; // 鏄惁璐ㄦ榛樿浼犲惁
+ productForm.value.productType = "product";
}
if (type === "edit") {
// 澶嶅埗琛屾暟鎹�
productForm.value = { ...row };
+ // 濡傛灉娌℃湁 productType锛岄粯璁や负 product (1)
+ if (!productForm.value.productType) {
+ productForm.value.productType = 1;
+ }
+
+ // 濡傛灉鏄澶囧浠剁被鍨嬶紝鍔犺浇璁惧澶囦欢鍒楄〃
+ if (productForm.value.productType === 2) {
+ await getSparePartsOptions();
+ }
+
// 濡傛灉鏄粠妯℃澘鍔犺浇鐨勬暟鎹紝鍙兘娌℃湁 productId 鍜� productModelId
// 闇�瑕佹牴鎹� productCategory 鍜� specificationModel 鏉ユ煡鎵惧搴旂殑 ID
- if (!productForm.value.productId && productForm.value.productCategory) {
+ if (!productForm.value.productId && productForm.value.productCategory && productForm.value.productType !== 2) {
// 鏍规嵁 productCategory 鏌ユ壘 productId
const findProductIdByCategory = (nodes, categoryName) => {
for (let i = 0; i < nodes.length; i++) {
@@ -1549,6 +1722,45 @@
return res;
});
};
+
+ // 鑾峰彇璁惧澶囦欢鍒楄〃
+ const getSparePartsOptions = () => {
+ return getSparePartsList({ current: -1, size: -1 }).then(res => {
+ if (res.data && Array.isArray(res.data.rows)) {
+ sparePartsOptions.value = res.data.rows;
+ } else if (res.data && Array.isArray(res.data.records)) {
+ sparePartsOptions.value = res.data.records;
+ } else {
+ sparePartsOptions.value = [];
+ }
+ return res;
+ });
+ };
+
+ // 澶勭悊绫诲瀷鍙樺寲
+ const handleProductTypeChange = (type) => {
+ productForm.value.productId = "";
+ productForm.value.productCategory = "";
+ productForm.value.productModelId = "";
+ productForm.value.specificationModel = "";
+ modelOptions.value = [];
+
+ if (type === 2) {
+ getSparePartsOptions();
+ }
+ };
+
+ // 澶勭悊璁惧澶囦欢閫夋嫨
+ const handleSparePartsChange = (value) => {
+ const selectedSparePart = sparePartsOptions.value.find(item => item.id === value);
+ if (selectedSparePart) {
+ productForm.value.productCategory = selectedSparePart.name;
+ productForm.value.specificationModel = "/";
+ } else {
+ productForm.value.productCategory = "";
+ productForm.value.specificationModel = "";
+ }
+ };
const getModels = value => {
if (value) {
productForm.value.productCategory =
@@ -1605,6 +1817,19 @@
// 鎻愪氦浜у搧琛ㄥ崟
const submitProduct = () => {
+ // 濡傛灉鏄澶囧浠讹紝鍏堣缃粯璁ゅ�硷紝鍐嶉獙璇�
+ if (productForm.value.productType === 2) {
+ productForm.value.specificationModel = "/";
+ productForm.value.productModelId = null;
+ productForm.value.unit = "";
+ productForm.value.taxRate = "";
+ productForm.value.taxInclusiveUnitPrice = 0;
+ productForm.value.taxInclusiveTotalPrice = 0;
+ productForm.value.taxExclusiveTotalPrice = 0;
+ productForm.value.warnNum = 0;
+ productForm.value.isChecked = false; // 鏄惁璐ㄦ榛樿浼犲惁
+ }
+
proxy.$refs["productFormRef"].validate(valid => {
if (valid) {
if (operationType.value === "edit") {
--
Gitblit v1.9.3