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/collaborativeApproval/purchaseApproval/index.vue | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/views/collaborativeApproval/purchaseApproval/index.vue b/src/views/collaborativeApproval/purchaseApproval/index.vue
index e3680fe..d39748f 100644
--- a/src/views/collaborativeApproval/purchaseApproval/index.vue
+++ b/src/views/collaborativeApproval/purchaseApproval/index.vue
@@ -278,7 +278,7 @@
},
rules: {
purchaseContractNumber: [
- { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+ { required: false, message: "璇疯緭鍏�", trigger: "blur" },
],
projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
supplierId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -329,12 +329,12 @@
},
});
const { productForm, productRules } = toRefs(productFormData);
- const upload = reactive({
- // 涓婁紶鐨勫湴鍧�
- url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
- // 璁剧疆涓婁紶鐨勮姹傚ご閮�
- headers: { Authorization: "Bearer " + getToken() },
- });
+ // const upload = reactive({
+ // // 涓婁紶鐨勫湴鍧�
+ // url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
+ // // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+ // headers: { Authorization: "Bearer " + getToken() },
+ // });
const changeDaterange = value => {
if (value) {
@@ -448,9 +448,7 @@
productData.value = [];
fileList.value = [];
if (operationType.value == "add") {
- createPurchaseNo().then(res => {
- form.value.purchaseContractNumber = res.data;
- });
+ form.value.purchaseContractNumber = "";
}
userListNoPage().then(res => {
userList.value = res.data;
@@ -521,7 +519,7 @@
}
// 鎻愪氦琛ㄥ崟
const submitForm = n => {
- proxy.$refs["formRef"].validate(valid => {
+ proxy.$refs["formRef"].validate(async valid => {
if (valid) {
if (productData.value.length > 0) {
form.value.productData = proxy.HaveJson(productData.value);
@@ -536,6 +534,21 @@
form.value.tempFileIds = tempFileIds;
form.value.type = 2;
form.value.approvalStatus = n;
+
+ // 濡傛灉閲囪喘鍚堝悓鍙蜂负绌猴紝鍒欐牴鎹綍鍏ユ棩鏈熻嚜鍔ㄧ敓鎴�
+ if (!form.value.purchaseContractNumber) {
+ try {
+ const purchaseNoRes = await createPurchaseNo(form.value.entryDate);
+ if (purchaseNoRes?.data) {
+ form.value.purchaseContractNumber = purchaseNoRes.data;
+ }
+ } catch (error) {
+ console.error("鐢熸垚閲囪喘鍚堝悓鍙峰け璐�:", error);
+ proxy.$modal.msgWarning("鐢熸垚閲囪喘鍚堝悓鍙峰け璐�");
+ return;
+ }
+ }
+
addOrEditPurchase(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
@@ -654,14 +667,10 @@
return;
}
if (operationType.value === "add") {
- productSelectedRows.value.forEach(selectedRow => {
- const index = productData.value.findIndex(
- product => product.id === selectedRow.id
- );
- if (index !== -1) {
- productData.value.splice(index, 1);
- }
- });
+ productData.value = productData.value.filter(
+ item => !productSelectedRows.value.includes(item)
+ );
+ productSelectedRows.value = [];
} else {
let ids = [];
if (productSelectedRows.value.length > 0) {
--
Gitblit v1.9.3