From 4dee4cb5b31a7f1dcd2c7b3d72f74b78d2fe3f29 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 18 九月 2026 15:56:41 +0800
Subject: [PATCH] fix: 质检是否入库
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 6a4b767..cc5f303 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -22,14 +22,10 @@
<el-row>
<el-col :span="24">
<el-form-item label="鐢宠閮ㄩ棬锛�">
- <el-select disabled
- v-model="form.approveDeptId"
- placeholder="閫夋嫨閮ㄩ棬">
- <el-option v-for="user in productOptions"
- :key="user.deptId"
- :label="user.deptName"
- :value="user.deptId" />
- </el-select>
+ <el-input v-model="form.approveDeptName"
+ placeholder=""
+ clearable
+ disabled />
</el-form-item>
</el-col>
</el-row>
@@ -42,6 +38,18 @@
clearable
type="textarea"
disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="Number(props.approveType) === 4">
+ <el-col :span="24">
+ <el-form-item label="鎶ラ攢閲戦锛�">
+ <el-input-number v-model="form.price"
+ disabled
+ :min="0"
+ :precision="2"
+ style="width: 100%"
+ placeholder="" />
</el-form-item>
</el-col>
</el-row>
@@ -150,6 +158,8 @@
label="瑙勬牸鍨嬪彿" />
<el-table-column prop="unit"
label="鍗曚綅" />
+ <el-table-column prop="packagingSpec"
+ label="浠舵暟" />
<el-table-column prop="quantity"
label="鏁伴噺" />
<el-table-column prop="taxInclusiveUnitPrice"
@@ -193,9 +203,9 @@
<el-descriptions-item label="鍙戣揣鏃ユ湡">{{ currentDelivery.shippingInfo.shippingDate || '--' }}</el-descriptions-item>
<el-descriptions-item label="瀹℃牳鐘舵��">{{ currentDelivery.shippingInfo.status || '--' }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ currentDelivery.shippingInfo.shippingCarNumber || '--' }}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑叕鍙�" v-if="false">{{ currentDelivery.shippingInfo.expressCompany || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="蹇�掑叕鍙�">{{ currentDelivery.shippingInfo.expressCompany || '--' }}</el-descriptions-item>
<el-descriptions-item label="蹇�掑崟鍙�"
- :span="2" v-if="false">{{ currentDelivery.shippingInfo.expressNumber || '--' }}</el-descriptions-item>
+ :span="2">{{ currentDelivery.shippingInfo.expressNumber || '--' }}</el-descriptions-item>
</el-descriptions>
<div style="margin-top: 20px;">
<h4>浜у搧鏄庣粏</h4>
@@ -211,6 +221,9 @@
show-overflow-tooltip />
<el-table-column prop="specificationModel"
label="瑙勬牸鍨嬪彿"
+ show-overflow-tooltip />
+ <el-table-column prop="packagingSpec"
+ label="浠舵暟"
show-overflow-tooltip />
<el-table-column prop="deliveryQuantity"
label="鍙戣揣鏁伴噺"
@@ -536,6 +549,8 @@
productName: item.productName ?? row.productName ?? "--",
specificationModel:
item.specificationModel ?? item.model ?? row.specificationModel ?? "--",
+ packagingSpec:
+ item.packagingSpec ?? row.packagingSpec ?? "--",
deliveryQuantity:
item.deliveryQuantity ??
item.quantity ??
--
Gitblit v1.9.3