From 7d47e7dc668d71831935f4da91bce366d4097396 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 29 八月 2026 11:19:14 +0800
Subject: [PATCH] 天津-豹鸣 1.协同办公展示发货信息
---
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
index b9eb42f..ceb28dd 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
@@ -19,9 +19,9 @@
{{ approvalTypeLabel(row.approvalType) }}
</span>
</el-descriptions-item>
- <el-descriptions-item label="鐢宠浜虹紪鍙�">{{ row.applicantNo || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鐢宠浜哄悕绉�">{{ row.applicantName || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鐢宠鎽樿">{{ row.summary || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣捣浜虹紪鍙�">{{ row.applicantNo || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣捣浜哄悕绉�">{{ row.applicantName || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鎽樿">{{ row.summary || "鈥�" }}</el-descriptions-item>
<el-descriptions-item v-if="row.rejectReason"
label="椹冲洖鍘熷洜"
:span="2">
@@ -50,11 +50,17 @@
<el-descriptions-item label="鍙戣揣璁㈠崟鍙�">{{ detailData.shippingInfo.shippingNo || "--" }}</el-descriptions-item>
<el-descriptions-item label="瀹㈡埛鍚嶇О">{{ detailData.shippingInfo.customerName || "--" }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣绫诲瀷">{{ detailData.shippingInfo.type || "--" }}</el-descriptions-item>
- <el-descriptions-item label="鍙戣揣鏃ユ湡">{{ detailData.shippingInfo.shippingDateDate || "--" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣揣鏃ユ湡">{{ detailData.shippingInfo.shippingDate || "--" }}</el-descriptions-item>
<el-descriptions-item label="瀹℃牳鐘舵��">{{ detailData.shippingInfo.status || "--" }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ detailData.shippingInfo.shippingCarNumber || "--" }}</el-descriptions-item>
<el-descriptions-item label="蹇�掑叕鍙�">{{ detailData.shippingInfo.expressCompany || "--" }}</el-descriptions-item>
<el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{ detailData.shippingInfo.expressNumber || "--" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣揣鍗曟嵁">{{ detailData.shippingInfo.shippingDocument || "--" }}</el-descriptions-item>
+ <el-descriptions-item label="鏄惁瀵硅处">{{ yesNo(detailData.shippingInfo.isReconciled) }}</el-descriptions-item>
+ <el-descriptions-item label="鏄惁缁撶畻">{{ yesNo(detailData.shippingInfo.isSettled) }}</el-descriptions-item>
+ <el-descriptions-item label="鏄惁宸插紑绁�">{{ yesNo(detailData.shippingInfo.isInvoiced) }}</el-descriptions-item>
+ <el-descriptions-item label="瀵硅处鍗曞綊妗ｆ儏鍐�" :span="2">{{ detailData.shippingInfo.statementArchivingStatus || "--" }}</el-descriptions-item>
+ <el-descriptions-item label="缁撶畻鍗曞綊妗ｆ儏鍐�" :span="2">{{ detailData.shippingInfo.settlementArchivingStatus || "--" }}</el-descriptions-item>
</el-descriptions>
<div v-if="detailData.shippingProductDetailDtoList.length" style="margin-top: 20px;">
<h4>浜у搧鏄庣粏</h4>
@@ -145,6 +151,22 @@
</div>
</div>
</template>
+
+ <!-- 鐘舵�佸彉鏇村鎵硅鎯� -->
+ <template v-else-if="row.businessType === 19">
+ <div class="device-status-detail">
+ <el-divider content-position="left">璁惧鐘舵�佸彉鏇磋鎯�</el-divider>
+ <el-descriptions :column="2" border>
+ <el-descriptions-item label="璁惧鍚嶇О">{{ detailData.deviceName || "--" }}</el-descriptions-item>
+ <el-descriptions-item label="鐩爣鐘舵��">
+ <el-tag :type="detailData.targetStatus === 1 ? 'success' : 'danger'">
+ {{ detailData.targetStatusName || "--" }}
+ </el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙樻洿鍘熷洜" :span="2">{{ detailData.reason || "--" }}</el-descriptions-item>
+ </el-descriptions>
+ </div>
+ </template>
</div>
<div v-if="attachmentList.length"
class="detail-block">
@@ -199,9 +221,9 @@
const formResolved = computed(() => resolveInstanceFormFields(props.row));
- // 鏄惁涓虹壒娈婂鎵圭被鍨嬶紙閲囪喘銆佸彂璐с�佹姤浠凤級
+ // 鏄惁涓虹壒娈婂鎵圭被鍨嬶紙閲囪喘銆佸彂璐с�佹姤浠枫�佽澶囩姸鎬佸彉鏇达級
const isSpecialApprovalType = computed(() => {
- return [5, 7, 6].includes(props.row.businessType);
+ return [5, 7, 6, 19].includes(props.row.businessType);
});
// 璇︽儏鏁版嵁锛堢洿鎺ヤ娇鐢ㄤ紶鍏ョ殑 detail-data 鍙傛暟锛�
@@ -218,6 +240,10 @@
if (!url) return;
window.open(url, "_blank");
}
+
+ function yesNo(val) {
+ return val === 1 || val === "1" || val === true ? "鏄�" : "鍚�";
+ }
</script>
<style scoped>
--
Gitblit v1.9.3