From 8251d3ac36429c3522b589518b60cecbd1d3ec5b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 20 二月 2024 21:50:45 +0800
Subject: [PATCH] 修改了文件
---
ruoyi-ui/src/views/device/equipmentInfo.vue | 2 +-
ruoyi-ui/src/views/travel/index.vue | 6 +++++-
ruoyi-ui/src/views/secret/secretInfo.vue | 10 +++++-----
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 4 +++-
ruoyi-ui/src/views/secret/index.vue | 4 ++--
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index cb2fbad..b5d3e25 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -101,6 +101,7 @@
style="margin-left: 10px"
size="small"
type="success"
+ v-if="btn"
@click="picUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -186,6 +187,7 @@
style="margin-left: 10px"
size="small"
type="success"
+ v-if="btn"
@click="fileUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header"> </h4>
@@ -478,7 +480,7 @@
var formData = new FormData();
this.$refs.upload1.submit();
// formData.append('uploadFile', file);
-
+ // if(this.uploadFileList1.length==0)
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index b8cbcd4..437cad7 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -24,7 +24,7 @@
<el-input v-model="formData.name" placeholder="璇疯緭鍏ヨ澶囧悕绉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
<el-form-item label="鏃堕棿" prop="happenTime">
- <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ユ椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ユ椂闂�" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
<el-form-item label="璐拱浜�" prop="buyer">
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index e2e1670..9da2047 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -117,7 +117,7 @@
</el-row>
- <el-table v-loading="loading" :data="secretList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" :data="secretList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
<el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center">
@@ -136,7 +136,7 @@
<template slot-scope="scope">{{scope.row.isFace===1 ?'鏄�': '鍚�'}}</template>
</el-table-column>
<el-table-column label="绉佹湁/鍏湁" prop="isPrivate" sortable width="100" >
- <template slot-scope="scope">{{scope.row.isFace===1 ?'绉佹湁': '鍏湁'}}</template>
+ <template slot-scope="scope">{{scope.row.isPrivate===1 ?'绉佹湁': '鍏湁'}}</template>
</el-table-column>
<el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="100" >
<template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template>
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index 44af156..4af8f93 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -336,7 +336,7 @@
this.formData.isFace = '鏄�'
else
this.formData.isFace = '鍚�'
- if(this.formData.isPrivate==1)
+ if(this.formData.isPrivate==0)
this.formData.isPrivate = '鍏湁'
else
this.formData.isPrivate = '绉佹湁'
@@ -399,9 +399,9 @@
else
this.formData.isFace = 0
if(this.formData.isPrivate== '鍏湁')
- this.formData.isPrivate =1
+ this.formData.isPrivate =0
else
- this.formData.isPrivate = 0
+ this.formData.isPrivate = 1
this.$refs['elForm'].validate(valid => {
@@ -417,7 +417,7 @@
this.formData.isFace = '鏄�'
else
this.formData.isFace = '鍚�'
- if(this.formData.isPrivate==1)
+ if(this.formData.isPrivate==0)
this.formData.isPrivate = '鍏湁'
else
this.formData.isPrivate = '绉佹湁'
@@ -433,7 +433,7 @@
this.formData.isFace = '鏄�'
else
this.formData.isFace = '鍚�'
- if(this.formData.isPrivate==1)
+ if(this.formData.isPrivate==0)
this.formData.isPrivate = '鍏湁'
else
this.formData.isPrivate = '绉佹湁'
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 9817e6e..33687b0 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -108,7 +108,9 @@
<el-table-column label="浣忓璐�" prop="stay" sortable width="100px" />
<el-table-column label="浜ら��" prop="travel" sortable width="70px" />
<el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
-<!-- <el-table-column label="璐墿" prop="shopping" sortable width="70px" />-->
+ <el-table-column label="鍏跺畠璐圭敤" prop="entrance" sortable width="120px" />
+ <el-table-column label="澶囨敞" prop="entrance" sortable width="120px" />
+
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
<template slot-scope="scope" >
<img
@@ -170,6 +172,7 @@
<el-table-column label="鏃呮父鍚嶇О" prop="name" sortable width="200px" />
<el-table-column label="鍘诲悜" prop="destination" sortable width="150px" />
<el-table-column label="鏃呮父鎬ц川" prop="property" sortable width="100" />
+ <el-table-column label="鎰熻█" prop="groupTotal" sortable width="120px" />
<el-table-column label="鏃呮父鏂瑰紡" prop="manner" sortable width="100" />
<el-table-column label="鎬婚噾棰�" prop="totalPrice" sortable width="100" />
<el-table-column label="椁愯垂" prop="eatTotal" sortable width="70px" />
@@ -177,6 +180,7 @@
<el-table-column label="浜ら��" prop="travelTotal" sortable width="70px" />
<el-table-column label="闂ㄧエ" prop="entranceTotal" sortable width="70px" />
<el-table-column label="鍥㈣垂" prop="groupTotal" sortable width="70px" />
+
<el-table-column label="鎿嶄綔" align="center" sortable width="180" >
--
Gitblit v1.9.1