From 2365a272f1883143294cc36b10e62d4a240e7df6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 18 七月 2026 09:58:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

---
 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 6a4b767..e4cc4c0 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>
@@ -45,6 +41,18 @@
             </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>
       </el-form>
       <!-- 鎶ヤ环瀹℃壒锛氬睍绀烘姤浠疯鎯咃紙澶嶇敤閿�鍞姤浠�"鏌ョ湅璇︽儏瀵硅瘽妗�"鍐呭缁撴瀯锛� -->
       <div v-if="isQuotationApproval"

--
Gitblit v1.9.3