From 867d84120fff6863ccf93c9d1ab97744a82a5397 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 14 五月 2026 14:53:46 +0800
Subject: [PATCH] 公海+采购合同
---
src/views/procurementManagement/procurementLedger/index.vue | 46 +++++++++++++++++++++++-----------------------
src/views/basicData/customerFileOpenSea/index.vue | 8 ++++----
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/views/basicData/customerFileOpenSea/index.vue b/src/views/basicData/customerFileOpenSea/index.vue
index 8c3abbc..7a84a4d 100644
--- a/src/views/basicData/customerFileOpenSea/index.vue
+++ b/src/views/basicData/customerFileOpenSea/index.vue
@@ -884,7 +884,7 @@
},
{
label: "棰嗙敤鐘舵��",
- prop: "usageStatus",
+ prop: "isAssigned",
dataType: "tag",
width: 100,
fixed: "right",
@@ -917,7 +917,7 @@
{
name: "鍒嗛厤",
type: "text",
- showHide: row => row.usageStatus != 1,
+ showHide: row => row.isAssigned != 1,
clickFun: row => {
openAssignDialog(row);
},
@@ -925,7 +925,7 @@
{
name: "鍥炴敹",
type: "text",
- showHide: row => row.usageStatus == 1,
+ showHide: row => row.isAssigned == 1,
clickFun: row => {
recycle(row);
},
@@ -933,7 +933,7 @@
{
name: "鍏变韩",
type: "text",
- showHide: row => row.usageStatus == 1,
+ showHide: row => row.isAssigned == 1,
clickFun: row => {
openShareDialog(row);
},
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 5555f66..8cb68a7 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -115,62 +115,62 @@
<el-table-column align="center"
label="搴忓彿"
type="index"
- width="60" />
+ width="80" />
<el-table-column label="閲囪喘鍚堝悓鍙�"
prop="purchaseContractNumber"
- width="160"
+ min-width="160"
show-overflow-tooltip />
<el-table-column label="閿�鍞悎鍚屽彿"
prop="salesContractNo"
- width="160"
+ min-width="160"
show-overflow-tooltip />
<el-table-column label="渚涘簲鍟嗗悕绉�"
prop="supplierName"
- width="160"
+ min-width="160"
show-overflow-tooltip />
<el-table-column label="椤圭洰鍚嶇О"
prop="projectName"
- width="320"
+ min-width="200"
show-overflow-tooltip />
- <el-table-column label="瀹℃壒鐘舵��"
- prop="approvalStatus"
- width="100"
- show-overflow-tooltip>
- <template #default="scope">
- <el-tag :type="getApprovalStatusType(scope.row.approvalStatus)"
- size="small">
- {{ approvalStatusText[scope.row.approvalStatus] || '鏈煡鐘舵��' }}
- </el-tag>
- </template>
- </el-table-column>
+ <!-- <el-table-column label="瀹℃壒鐘舵��"-->
+ <!-- prop="approvalStatus"-->
+ <!-- width="100"-->
+ <!-- show-overflow-tooltip>-->
+ <!-- <template #default="scope">-->
+ <!-- <el-tag :type="getApprovalStatusType(scope.row.approvalStatus)"-->
+ <!-- size="small">-->
+ <!-- {{ approvalStatusText[scope.row.approvalStatus] || '鏈煡鐘舵��' }}-->
+ <!-- </el-tag>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column label="绛捐鏃ユ湡"
prop="executionDate"
- width="100"
+ width="120"
show-overflow-tooltip />
<el-table-column label="浠樻鏂瑰紡"
- width="100"
+ width="120"
prop="paymentMethod"
show-overflow-tooltip />
<el-table-column label="鍚堝悓閲戦(鍏�)"
prop="contractAmount"
- width="200"
+ width="150"
show-overflow-tooltip
:formatter="formattedNumber" />
<el-table-column label="褰曞叆浜�"
prop="recorderName"
- width="120"
+ width="100"
show-overflow-tooltip />
<el-table-column label="褰曞叆鏃ユ湡"
prop="entryDate"
- width="100"
+ width="120"
show-overflow-tooltip />
<el-table-column label="澶囨敞"
prop="remarks"
- width="200"
+ min-width="150"
show-overflow-tooltip />
<el-table-column fixed="right"
label="鎿嶄綔"
- width="120"
+ width="140"
align="center">
<template #default="scope">
<el-button link
--
Gitblit v1.9.3