From 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 17 十一月 2024 11:31:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/economy/economyInfo.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index 6771054..fdc1d57 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -25,7 +25,7 @@
         <el-input v-model="formData.createTime" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
       </el-form-item>
       <el-form-item label="鏀跺叆/鏀嚭" prop="price">
-		  <el-select v-model="formData.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}"  >
+		  <el-select :disabled="dsb" v-model="formData.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}"  >
 		    <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
 		    ></el-option>
 		  </el-select>
@@ -142,7 +142,7 @@
           ></video>
           <img v-else
                class="el-upload-list__item-thumbnail"
-               src="../../assets/401_images/401.gif"
+               src="../../assets/images/deviceLis.png"
                alt=""
                style="width: 147px; height: 147px"
                fit="cover">
@@ -306,7 +306,7 @@
       this.btn= jd;
       this.dsb = !jd;
       this.isShow=true;
-      this.$route.meta.title = "淇敼瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+      this.$route.meta.title = "淇敼瀹跺涵鏀舵敮鍙拌处淇℃伅";//鍒楄〃鐨勫悕绉�
     }
     else{
       this.$route.meta.title = "瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�

--
Gitblit v1.9.1