From 5af665569d0cc093184f99b70ac38745ef53b911 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 21 九月 2026 20:39:04 +0800
Subject: [PATCH] 新疆-融邦环保 1.油品出库表单改「多台账分摊绑定」：各台账数量之和必须等于出库吨位，产品取各台账明细交集，代储不锁行可自由增删 2.新增到货记录模块：销售台账页入口，车辆随出库单联动，到货上限=该台账分摊量，附件走永久链接 3.发货台账改层级父行：油品出库为父行，children 为到货记录，来源列区分发货单/油品出库/到货 4.开票/收款候选按「出库单×客户」拆行，bindingId 与出库单 id 分两串回传，防重复开票/收款 5.销售台账下拉补产品/规格型号 6.代储入库绑定销售订单：油品入库表单加销售订单下拉，入库台账列表加「销售订单」列 7.采购申请补齐台账字段（油库、采购合同号、提货方式、物流方式、最佳到站日期、采购类别、付款方式、预警数量、附件等） 8.修复采购申请「转订单后跳转无反应」 9.采购台账删掉「销售合同号」的搜索条件、列表列和表单字段 10.公海客户新增「信托基金(元)」，代储金额合计超限标红提示
---
src/views/procurementManagement/procurementLedger/index.vue | 59 +----------------------------------------------------------
1 files changed, 1 insertions(+), 58 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index e059cf9..7fc3509 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -19,13 +19,6 @@
clearable
:prefix-icon="Search" />
</el-form-item>
- <el-form-item label="閿�鍞悎鍚屽彿锛�">
- <el-input v-model="searchForm.salesContractNo"
- placeholder="璇疯緭鍏�"
- clearable
- prefix-icon="Search"
- @change="handleQuery" />
- </el-form-item>
<el-form-item label="椤圭洰鍚嶇О锛�">
<el-input v-model="searchForm.projectName"
placeholder="璇疯緭鍏�"
@@ -144,10 +137,6 @@
width="60" />
<el-table-column label="閲囪喘鍚堝悓鍙�"
prop="purchaseContractNumber"
- width="160"
- show-overflow-tooltip />
- <el-table-column label="閿�鍞悎鍚屽彿"
- prop="salesContractNo"
width="160"
show-overflow-tooltip />
<el-table-column label="渚涘簲鍟嗗悕绉�"
@@ -288,21 +277,6 @@
<el-input v-model="form.purchaseContractNumber"
placeholder="璇疯緭鍏�"
clearable />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="閿�鍞悎鍚屽彿锛�"
- prop="salesLedgerId">
- <el-select v-model="form.salesLedgerId"
- placeholder="璇烽�夋嫨"
- filterable
- clearable
- @change="salesLedgerChange">
- <el-option v-for="item in salesContractList"
- :key="item.id"
- :label="item.salesContractNo"
- :value="item.id" />
- </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -881,7 +855,6 @@
addOrUpdateSalesLedgerProduct,
delProduct,
delLedgerFile,
- getProductInfoByContractNo,
} from "@/api/salesManagement/salesLedger.js";
import {
addOrEditPurchase,
@@ -889,7 +862,6 @@
updatePurchaseTemplate,
createPurchaseNo,
delPurchase,
- getSalesNo,
purchaseListPage,
productList,
getPurchaseById,
@@ -912,7 +884,6 @@
const modelOptions = ref([]);
const userList = ref([]);
const productOptions = ref([]);
- const salesContractList = ref([]);
const supplierList = ref([]);
const oilDepotList = ref([]);
const tableLoading = ref(false);
@@ -1079,7 +1050,6 @@
searchForm: {
supplierName: "", // 渚涘簲鍟嗗悕绉�
purchaseContractNumber: "", // 閲囪喘鍚堝悓缂栧彿
- salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
projectName: "", // 椤圭洰鍚嶇О
entryDate: null, // 褰曞叆鏃ユ湡
entryDateStart: undefined,
@@ -1087,7 +1057,6 @@
},
form: {
purchaseContractNumber: "",
- salesLedgerId: "",
projectName: "",
recorderId: "",
entryDate: "",
@@ -1499,13 +1468,11 @@
isTemplateNameDuplicate.value = false;
try {
// 骞惰鍔犺浇鍩虹鏁版嵁
- const [salesRes, supplierRes, oilDepotRes] = await Promise.all([
- getSalesNo(),
+ const [supplierRes, oilDepotRes] = await Promise.all([
getOptions(),
allOilDepot(),
]);
- salesContractList.value = salesRes || [];
// 渚涘簲鍟嗚繃婊ゅ嚭isWhite=0 鐨勬暟鎹�
supplierList.value = (supplierRes.data || []).filter(
item => item.isWhite === 0
@@ -1616,11 +1583,6 @@
}
form.value.storageBlobDTOS = fileList.value;
form.value.type = 2;
-
- // 濡傛灉salesLedgerId涓虹┖锛屽垯涓嶄紶閫抯alesContractNo
- if (!form.value.salesLedgerId) {
- form.value.salesContractNo = "";
- }
// 鏂板鏃朵笉浼犻�抜d
const submitData = { ...form.value };
@@ -2059,25 +2021,6 @@
const purchaseCategoryChange = val => {
if (!["浠ｅ偍", "閲囪喘鐩撮攢"].includes(val)) {
form.value.customerName = "";
- }
- };
-
- // 閿�鍞悎鍚岄�夋嫨鏀瑰彉鏂规硶
- const salesLedgerChange = async row => {
- console.log("row", row);
- var index = salesContractList.value.findIndex(item => item.id == row);
- console.log("index", index);
- if (index > -1) {
- await querygProductInfoByContractNo();
- }
- };
-
- const querygProductInfoByContractNo = async () => {
- const { code, data } = await getProductInfoByContractNo({
- contractNo: form.value.salesLedgerId,
- });
- if (code == 200) {
- productData.value = data || [];
}
};
--
Gitblit v1.9.3