From c1cff08cdbcee3278c1ac8d8a3a067e3bf015202 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 21 二月 2024 22:45:01 +0800
Subject: [PATCH] 提交新内容

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

diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index 254f044..c5ee8a4 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -22,8 +22,12 @@
         <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-input v-model="formData.price" placeholder="璇疯緭鍏ラ�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" :disabled="dsb">
-        </el-input>
+		  <el-select 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>
+ <!--       <el-input v-model="formData.price" placeholder="璇疯緭鍏ラ�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" :disabled="dsb">
+        </el-input> -->
       </el-form-item>
       <el-form-item label="鐢ㄩ��" prop="useFor">
         <el-input v-model="formData.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" :disabled="dsb">
@@ -38,17 +42,17 @@
         </el-input>
       </el-form-item>
       <el-form-item label="閲戦" prop="balance">
-        <el-input v-model="formData.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+        <el-input v-model="formData.balance" type="number" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
       </el-form-item>
       <el-form-item label="澶囨敞" prop="remark">
         <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
       </el-form-item>
-      <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">
-        <el-input  v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
-      </el-form-item>
+   <!--   <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">
+        <el-input  v-model="formData.ownData === 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled="true"></el-input>
+      </el-form-item> -->
 
 
-      <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+      <h4 class="form-header">鐩稿叧鍥剧墖</h4>
       <el-upload
         action="#"
         list-type="picture-card"
@@ -126,7 +130,7 @@
                class="el-upload-list__item-thumbnail"
                src="../../assets/401_images/401.gif"
                alt=""
-               style="width: 100%; height: 100%"
+               style="width: 147px; height: 147px"
                fit="cover">
 
           <span class="el-upload-list__item-actions">
@@ -165,7 +169,7 @@
 
 
     <el-dialog  :visible.sync="dialogVisible">
-      <img w-full :src="dialogImageUrl" alt="Preview Image" />
+      <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
     </el-dialog>
   </div>
 </template>
@@ -183,7 +187,10 @@
     return {
       cdi:"璧勪骇璇︾粏淇℃伅",
       udi:"璧勪骇淇℃伅淇敼",
-      fot:[".jpg",".jif"],
+      // 鏁版嵁鑼冨洿閫夐」
+      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
       fileList:[
       ],
       fileListOther:[
@@ -243,6 +250,16 @@
           trigger: 'change'
         }],
       },
+	  typeOptions2: [
+	    {
+	      value: '鏀跺叆',
+	      label: '鏀跺叆',
+	    },
+	    {
+	      value: '鏀嚭',
+	      label: '鏀嚭',
+	    }
+	  ],
       typeOptions: [{
         value: '0',
         label: '鍩洪噾',
@@ -260,15 +277,13 @@
     let jd;
     if(this.$route.query.detail!=undefined)
     {
-      jd =  this.$route.query.detail
-      this.btn= jd
-      this.dsb = !jd
-      this.isShow=true
-      document.title = "淇敼瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";
+      jd =  this.$route.query.detail;
+      this.btn= jd;
+      this.dsb = !jd;
+      this.isShow=true;
       this.$route.meta.title = "淇敼瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
     }
     else{
-      document.title = "瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";
       this.$route.meta.title = "瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
       this.isShow=false;
       this.btn = false;
@@ -279,6 +294,8 @@
       this.loading = true;
       getEconomyInfo(id).then((response) => {
         this.formData = response.data;
+       // console.log(this.formData)
+        //alert(this.formData.ownData)
         let paths = response.data.url.split(",");
         for(let i = 0; i < paths.length; i++)
         {
@@ -298,7 +315,7 @@
         }
         this.loading = false;
       });
-      this.getCateInfor()
+   //   this.getCateInfor()
 
     }
   },
@@ -425,6 +442,20 @@
           _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
 
         }
+        let ul = _this.fileList.map(function (elem){
+            return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+          }).join(",")
+          let uls = _this.fileListOther.map(function (elem){
+            return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+          }).join(",")
+          _this.formData.url = ul+","+uls
+          console.log(_this.formData.url)
+        //  alert(87)
+          updateEconomy(_this.formData).then(response => {
+            this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+            // this.open = false;
+
+          });
       })
 
     },
@@ -440,7 +471,7 @@
 }
 
 </script>
-<style scoped lang="scss">
+<style scoped>
 .mt
 {
   position: relative;
@@ -455,7 +486,7 @@
   display: block;
   position: absolute;
 }
-.hide .el-upload--picture-card {
+.hide /deep/ .el-upload--picture-card {
   display: none;
 }
 .form{

--
Gitblit v1.9.1