From de26a68bb2cf0caa9a35e8eb6dce852435143b25 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 21 八月 2026 19:42:12 +0800
Subject: [PATCH] feat: 发货新增自提选择

---
 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 6a4b767..ba3641b 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>
@@ -192,7 +200,8 @@
                 <el-descriptions-item label="鍙戣揣绫诲瀷">{{ currentDelivery.shippingInfo.type || '--' }}</el-descriptions-item>
                 <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="currentDelivery.shippingInfo.type !== '鑷彁'">{{ currentDelivery.shippingInfo.shippingCarNumber || '--' }}</el-descriptions-item>
                 <el-descriptions-item label="蹇�掑叕鍙�" v-if="false">{{ currentDelivery.shippingInfo.expressCompany || '--' }}</el-descriptions-item>
                 <el-descriptions-item label="蹇�掑崟鍙�"
                                       :span="2" v-if="false">{{ currentDelivery.shippingInfo.expressNumber || '--' }}</el-descriptions-item>

--
Gitblit v1.9.3