From 90b6b8c9e342d07e8a7121d732900287d997a8b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 03 三月 2025 22:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index d2337a7..7add9d9 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -54,7 +54,7 @@
               </el-form-item>
             </el-cow>
             <el-cow >
-              <el-form-item label="鍙樻洿/娉ㄩ攢" prop="isChange" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+              <el-form-item label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" label-width="120px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                 <el-select v-model="formData.isChange" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}" :disabled="dsb"  >
                   <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
                   ></el-option>
@@ -83,7 +83,7 @@
             </el-cow>
             <el-cow >
               <el-form-item label="澶囨敞" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+                <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb" type="textarea"></el-input>
               </el-form-item>
             </el-cow>
           </el-row>
@@ -299,7 +299,7 @@
         }],
         isChange: [{
           required: true,
-          message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+          message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢/璐拱',
           trigger: 'blur'
         }],
         price: [{
@@ -346,10 +346,15 @@
         value: '鍙樻洿',
         label: '鍙樻洿',
       },
-        {
-          value: '娉ㄩ攢',
-          label: '娉ㄩ攢',
-        }],
+      {
+        value: '娉ㄩ攢',
+        label: '娉ㄩ攢',
+      },
+      {
+        value: '璐拱',
+        label: '璐拱',
+      },
+      ],
     }
   },
   computed: {},

--
Gitblit v1.9.1