From 6de6e76034d1fafd98fc64c8c94eb4cb306b2a70 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 06 五月 2026 14:10:35 +0800
Subject: [PATCH] 新疆马铃薯 1.设备台账添加是否为物联设备和外联编码字段、删除设备品牌字段
---
src/views/salesManagement/deliveryLedger/index.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index de52c68..97ac1d8 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -34,10 +34,12 @@
<el-table-column label="閿�鍞鍗�" prop="salesContractNo" show-overflow-tooltip />
<el-table-column label="鍙戣揣璁㈠崟鍙�" prop="shippingNo" show-overflow-tooltip />
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip />
+ <el-table-column label="浜у搧鍚嶇О" prop="productName" show-overflow-tooltip />
+ <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
<el-table-column label="鍙戣揣鏃堕棿" prop="shippingDate" show-overflow-tooltip />
<el-table-column label="鍙戣揣杞︾墝鍙�" prop="shippingCarNumber" show-overflow-tooltip />
- <el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip />
- <el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip />
+ <!-- <el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip /> -->
+ <!-- <el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip /> -->
<el-table-column label="瀹℃牳鐘舵��" prop="status" align="center" width="120">
<template #default="scope">
<el-tag :type="getApprovalStatusType(scope.row.status)">
@@ -45,24 +47,22 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="200" align="center">
+ <el-table-column fixed="right" label="鎿嶄綔" width="220" align="center">
<template #default="scope">
<el-button
link
- type="primary"
- size="small"
+ type="primary"
:disabled="!isApproved(scope.row.status)"
@click="openForm('edit', scope.row)">琛ュ厖鍙戣揣淇℃伅</el-button>
<el-button
link
type="primary"
- size="small"
+ style="color: #67C23A"
@click="openDetail(scope.row)"
>璇︽儏</el-button>
<el-button
link
- type="danger"
- size="small"
+ type="danger"
:disabled="isApproving(scope.row.status)"
@click="handleDeleteSingle(scope.row)">鍒犻櫎</el-button>
</template>
@@ -180,12 +180,14 @@
<el-descriptions-item label="閿�鍞鍗�">{{ detailRow.salesContractNo || '--' }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣璁㈠崟鍙�">{{ detailRow.shippingNo || '--' }}</el-descriptions-item>
<el-descriptions-item label="瀹㈡埛鍚嶇О">{{ detailRow.customerName || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="浜у搧鍚嶇О">{{ detailRow.productName || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="瑙勬牸鍨嬪彿">{{ detailRow.specificationModel || '--' }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣绫诲瀷">{{ detailRow.type || '--' }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣鏃ユ湡">{{ detailRow.shippingDate || '--' }}</el-descriptions-item>
<el-descriptions-item label="瀹℃牳鐘舵��">{{ getApprovalStatusText(detailRow.status) }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ detailRow.shippingCarNumber || '--' }}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑叕鍙�">{{ detailRow.expressCompany || '--' }}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{ detailRow.expressNumber || '--' }}</el-descriptions-item>
+ <!-- <el-descriptions-item label="蹇�掑叕鍙�">{{ detailRow.expressCompany || '--' }}</el-descriptions-item> -->
+ <!-- <el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{ detailRow.expressNumber || '--' }}</el-descriptions-item> -->
</el-descriptions>
<div class="detail-images" v-if="detailImages.length">
@@ -284,6 +286,8 @@
id: null,
salesContractNo: "",
customerName: "",
+ specificationModel: "",
+ productName: "",
type: "璐ц溅", // 璐ц溅, 蹇��
shippingDate: "",
shippingCarNumber: "",
@@ -364,7 +368,7 @@
id: row.id ?? null,
salesContractNo: row.salesContractNo ?? "",
customerName: row.customerName ?? "",
- type: row.type || "璐ц溅",
+ type: "璐ц溅",
shippingDate: row.shippingDate || getCurrentDate(),
shippingCarNumber: row.shippingCarNumber ?? "",
expressCompany: row.expressCompany ?? "",
@@ -633,6 +637,7 @@
'瀹℃牳涓�': '瀹℃牳涓�',
'瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
'瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
+ '宸插彂璐�': '宸插彂璐�',
'0': '寰呭鏍�',
'1': '瀹℃牳涓�',
'2': '瀹℃牳鎷掔粷',
@@ -663,6 +668,7 @@
'瀹℃牳涓�': 'warning',
'瀹℃牳鎷掔粷': 'danger',
'瀹℃牳閫氳繃': 'success',
+ '宸插彂璐�': 'success',
'0': 'info',
'1': 'warning',
'2': 'danger',
--
Gitblit v1.9.3