From f3c6616d20f5f7ecedd8a0517936856e0ec1c2aa Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期日, 07 四月 2024 17:25:37 +0800
Subject: [PATCH] 完善了家庭会议模块，解决了个人记事本详情其他附件需要更新才能查看的问题
---
ruoyi-ui/src/views/meeting/approve.vue | 2
ruoyi-ui/src/assets/icons/pic.png | 0
ruoyi-ui/src/views/meeting/statistics.vue | 276 ++++++++++++++++++++++++
ruoyi-ui/src/views/meeting/statisticsInfo.vue | 304 +++++++++++++++++++++++++++
ruoyi-ui/src/views/self/memoInfo.vue | 43 +++
ruoyi-ui/src/router/index.js | 9
ruoyi-ui/src/views/meeting/index.vue | 15
7 files changed, 634 insertions(+), 15 deletions(-)
diff --git a/ruoyi-ui/src/assets/icons/pic.png b/ruoyi-ui/src/assets/icons/pic.png
new file mode 100644
index 0000000..757b1db
--- /dev/null
+++ b/ruoyi-ui/src/assets/icons/pic.png
Binary files differ
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index b8f75d4..1716239 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -187,6 +187,15 @@
// permissions: [],
hidden: true,
permissions: ['meetingModel:statistics:list'],
+ children: [
+ {
+ // path: 'statisticsInfo/',
+ path: 'statisticsInfo/:id(\\d+)',
+ component: () => import('@/views/meeting/statisticsInfo'),
+ name: 'statisticsInfo',
+ meta: { title: '缁熻璇︽儏',activeMenu: '/meeting/statisticsInfo'}
+ }
+ ]
},
//鐩存挱
{
diff --git a/ruoyi-ui/src/views/meeting/approve.vue b/ruoyi-ui/src/views/meeting/approve.vue
index c67d6c1..076a163 100644
--- a/ruoyi-ui/src/views/meeting/approve.vue
+++ b/ruoyi-ui/src/views/meeting/approve.vue
@@ -111,7 +111,7 @@
data() {
return {
tableData: [
- { title: '1', name: 'asasd', address: 'asdadsdasd', id: 1, age: '30' },
+ { title: '1', name: 'asasd', address: 'asdadsdasd', id: 9, age: '30' },
{ title: '2', name: 'qweqwqwe', address: 'qweqweqwe', id: 2, age: '30' },
{ title: '3', name: 'zxczxczxc', address: 'zxczxczcx', id: 3, age: '30' },
{ title: '4', name: 'fghfghfh', address: 'fghfghfgh', id: 4, age: '30' },
diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue
index 0d8eda7..84fb7de 100644
--- a/ruoyi-ui/src/views/meeting/index.vue
+++ b/ruoyi-ui/src/views/meeting/index.vue
@@ -318,10 +318,9 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- content:undefined,
- buyer:undefined,
- location:undefined,
- createDate:undefined,
+ address:undefined,
+ applyOrganization:undefined,
+ applicant:undefined,
happenTime:undefined
},
dateRange: [],
@@ -364,14 +363,16 @@
trigger: 'blur'
}],
},
- typeOptions: [{
+ typeOptions: [
+ {
value: '1',
label: '鏄�',
- },
+ },
{
value: '0',
label: '鍚�',
- }],
+ }
+ ],
}
},
diff --git a/ruoyi-ui/src/views/meeting/statistics.vue b/ruoyi-ui/src/views/meeting/statistics.vue
index a9def5e..7217719 100644
--- a/ruoyi-ui/src/views/meeting/statistics.vue
+++ b/ruoyi-ui/src/views/meeting/statistics.vue
@@ -10,31 +10,280 @@
<div class="button-container"></div>
<div style="display: flex; align-items: center;">
<el-button @click="pictureStatistics" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 10px">
- <div class="form"><el-icon style="padding-right:30px;"></el-icon>
+ <div class="form1"><el-icon style="padding-right:50px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
- font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鍥炬爣缁熻</span>
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鍥捐〃缁熻</span>
</div>
</el-button>
</div>
<div style="display: flex; align-items: center;">
<el-button @click="newRequest" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 10px">
- <div class="form" style="width: 100px;"><el-icon style="padding-right:30px;"></el-icon>
+ <div class="form2" style="width: 100px;"><el-icon style="padding-right:30px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鏂板缓</span>
</div>
</el-button>
</div>
-
</h1>
<hr />
+
+ <el-table :data="tableData" border :header-cell-style="{ background: 'pink', fontSize: '13px', color: 'black' }"
+ :row-class-name="tableRowClassName" :row-key="getRowId">
+ <el-table-column label="瀹跺涵鍙�" prop="num" sortable align="center">
+ <template slot-scope="scope">{{ scope.row.num
+ ? scope.row.num : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <el-table-column label="浣跨敤鏃堕棿" prop="time" sortable align="center">
+ <template slot-scope="scope">{{ scope.row.time
+ ? scope.row.time : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <el-table-column label="浼氳瀹ゅ悕绉�" prop="address" sortable align="center">
+ <template slot-scope="scope">{{
+ scope.row.address ? scope.row.address : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <el-table-column label="鏍囬" prop="title" sortable align="center">
+ <template slot-scope="scope">{{ scope.row.title
+ ? scope.row.title : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <el-table-column label="鐢宠浜�" prop="applicant" sortable align="center">
+ <template slot-scope="scope">{{
+ scope.row.applicant ? scope.row.applicant : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <el-table-column label="瀹℃壒浜�" prop="approve" sortable align="center">
+ <template slot-scope="scope">{{ scope.row.approve ?
+ scope.row.approve : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <el-table-column label="鐘舵��" prop="status" sortable align="center">
+ <template slot-scope="scope">{{ scope.row.status
+ ? scope.row.status : '鈥斺�斺�斺��' }}</template>
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
+ <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <div class="button-container">
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+ <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
+ </div>
+ </template>
+ </el-table-column>
+
+ </el-table>
+
+ <!-- 鏂板鏁版嵁妗� -->
+ <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+
+ <el-form-item label="瀹跺涵鍙�" prop="num">
+ <el-input v-model="formDat.num" placeholder="璇疯緭鍏ヤ細璁鍚嶇О" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="寮�濮嬫椂闂�" prop="happenTime">
+ <el-date-picker v-model="formDat.happenTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃堕棿" prop="endTime">
+ <el-date-picker v-model="formDat.endTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
+ </el-form-item>
+
+ <el-form-item label="浼氳瀹ゅ悕绉�" prop="address">
+ <el-input v-model="formDat.address" placeholder="璇疯緭鍏ヤ細璁鍚嶇О" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="鏍囬" prop="meetingTitle">
+ <el-input v-model="formDat.meetingTitle" placeholder="璇疯緭鍏ヤ細璁爣棰�" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="鐢宠浜�" prop="applicant">
+ <el-input v-model="formDat.applicant" placeholder="璇疯緭鍏ョ敵璇蜂汉" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="瀹℃壒浜�" prop="approve">
+ <el-input v-model="formDat.approve" placeholder="璇疯緭鍏ュ鎵逛汉" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="formDat.status" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}">
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+
+ </el-form>
+
+ </el-upload>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
<script>
+ export default {
+ data() {
+ return {
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ open: false,
+ title: "",
+ tableData: [{
+ id: 1,
+ num: '1',
+ title: '1',
+ name: 'asasd',
+ address: 'asdadsdasd',
+ status: '缁撴'
+ },
+ {
+ id: 2,
+ num: '2',
+ title: '2',
+ name: 'qweqwqwe',
+ address: 'qweqweqwe',
+ status: '鏈粨妗�'
+ }
+ ],
+ formDat:{
+ id: undefined,
+ happenTime: undefined,
+ endTime: undefined,
+ meetingTitle: undefined,
+ address: undefined,
+ approve: undefined,
+ applicant: undefined,
+ url: "",
+ status: undefined,
+ num: undefined
+ },
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ address:undefined,
+ applyOrganization:undefined,
+ applicant:undefined,
+ happenTime:undefined
+ },
+ dateRange: [],
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ name: [{
+ required: true,
+ message: '璇疯緭鍏ヨ澶囧悕绉�',
+ trigger: 'blur'
+ }],
+ },
+ typeOptions: [
+ {
+ value: '1',
+ label: '缁撴',
+ },
+ {
+ value: '0',
+ label: '鏈粨妗�',
+ }
+ ],
+
+
+ }
+ },
+ methods: {
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.dateRange = [];
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+
+
+ newRequest(){
+ this.open = true;
+ this.title = "鏂板"
+ },
+ cancel() {
+ this.open = false;
+ // this.reset();
+ },
+ submitDataScope() {
+ console.log(666)
+ },
+
+ tableRowClassName({
+ row,
+ rowIndex
+ }) {
+ if (rowIndex % 2 == 0) {
+ return "statistics-warning-row1";
+ } else {
+ return "statistics-warning-row";
+ }
+ },
+ getRowId(row) {
+ return row.id
+ },
+
+ // 淇敼
+ handleUpdate(row) {
+ const id = row.id;
+ let jd = true
+
+ this.$router.push({
+ path:"/meeting/statistics/statisticsInfo/" + id,
+ query:{
+ detail:jd
+ }
+ });
+ },
+ // 鏌ョ湅璇︾粏淇℃伅
+ handleCheck(row){
+ const id = row.id;
+ this.$router.push("/meeting/statistics/statisticsInfo/" + id);
+ },
+
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
+ return delSelfEconomy(Ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+
+ // 鍥捐〃缁熻
+ pictureStatistics(){
+
+ },
+
+ }
+ }
</script>
<style scoped>
.el-table__row.statistics-warning-row {
@@ -59,9 +308,26 @@
.app-container {
background-color: #FEF7FC;
}
- .form{
+ .form1{
+ background:left/40% no-repeat url('../../assets/icons/pic.png') ;
+ height: 50px;
+ line-height: 50px;
+ }
+ .form2{
background:left/25% no-repeat url('../../assets/icons/add1.png') ;
height: 50px;
line-height: 50px;
}
+
+ /deep/ .el-table .statistics-warning-row {
+ background: #E0EEFE;
+ }
+
+ /deep/ .el-table .statistics-warning-row1 {
+ background: #FFEFF2;
+ }
+
+ .el-table {
+ border-radius: 14px 14px 14px 14px;
+ }
</style>
diff --git a/ruoyi-ui/src/views/meeting/statisticsInfo.vue b/ruoyi-ui/src/views/meeting/statisticsInfo.vue
new file mode 100644
index 0000000..02e18c9
--- /dev/null
+++ b/ruoyi-ui/src/views/meeting/statisticsInfo.vue
@@ -0,0 +1,304 @@
+<template>
+ <div class="app-container" id="printable-content">
+ <div class="form-header mt">
+ <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
+ <span>浼氳璇︽儏</span>
+ </h1>
+ </div>
+ <div style="padding-left:15px">
+ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="160px">
+
+ <el-container>
+
+ <el-row :span="12">
+
+ <el-cow>
+ <el-form-item label="瀹跺涵鍙�" prop="num" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.num" placeholder="璇疯緭鍏ュ搴彿" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+
+ <el-cow>
+ <el-form-item label="寮�濮嬫椂闂�" prop="happenTime" label-width="80px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-date-picker v-model="formDat.happenTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+ :picker-options="pickerOptions" :style="{width: '100%'}">
+ </el-date-picker>
+ </el-form-item>
+ </el-cow>
+
+ <el-cow>
+ <el-form-item label="缁撴潫鏃堕棿" prop="endTime" label-width="80px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-date-picker v-model="formDat.endTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+ :picker-options="pickerOptions" :style="{width: '100%'}">
+ </el-date-picker>
+ </el-form-item>
+ </el-cow>
+
+ <el-cow>
+ <el-form-item label="浼氳瀹ゅ悕绉�" prop="address" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.address" placeholder="璇疯緭鍏ヤ細璁鍚嶇О" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+
+ <el-cow>
+ <el-form-item label="鏍囬" prop="title" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.title" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+
+ <el-cow>
+ <el-form-item label="鐢宠浜�" prop="applicant" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.applicant" placeholder="璇疯緭鍏ョ敵璇蜂汉" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+
+ <el-cow>
+ <el-form-item label="瀹℃壒浜�" prop="approve" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.approve" placeholder="璇疯緭鍏ュ鎵逛汉" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+
+ <el-cow>
+ <el-form-item label="鐘舵��" prop="status" label-width="120px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-select v-model="formDat.status" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}"
+ :disabled="dsb">
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-cow>
+
+ </el-row>
+ </el-container>
+
+ <h4 class="form-header"> </h4>
+ <el-form-item size="large">
+ <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+
+
+ </div>
+</template>
+
+<script>
+ export default {
+ components: {},
+ props: [],
+ data() {
+ return {
+ cdi: "涓汉璐骇璇︾粏淇℃伅",
+ udi: "涓汉璐骇淇℃伅璇︽儏",
+ // 鏁版嵁鑼冨洿閫夐」
+ fot: ['.bmp', '.jpg', '.jpeg', '.png', '.tif', '.gif', '.pcx', '.tga', '.exif', '.fpx',
+ '.svg', '.psd', '.cdr', '.pcd', '.dxf', '.ufo', '.eps', '.ai', '.aw', '.WMF', '.webp', '.apng'
+ ],
+
+ fileList: [],
+ fileList1: [],
+ uploadFileList: [],
+ uploadFileList1: [],
+ fileListOther: [],
+ dsb: true,
+ btn: false,
+ isShow: true,
+ uploading: false,
+
+ formDat: {
+ id: undefined,
+ happenTime: undefined,
+ endTime: undefined,
+ timeSpan: undefined,
+ meetingTitle: undefined,
+ address: undefined,
+ meetingID: undefined,
+ capacity: undefined,
+ attendance: undefined,
+ applicant: undefined,
+ familyName: undefined,
+ name: undefined,
+ phone: undefined,
+ url: "",
+ status: undefined
+
+
+ },
+ dialogImageUrl: '',
+ dialogVisible: false,
+ disabled: false,
+ rules: {
+ meetingTitle: [{
+ required: true,
+ message: '璇疯緭鍏ヤ細璁爣棰�',
+ trigger: 'blur'
+ }],
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨寮�濮嬫椂闂�',
+ trigger: 'blur'
+ }],
+ endTime: [{
+ required: true,
+ message: '璇烽�夋嫨缁撴潫鏃堕棿',
+ trigger: 'blur'
+ }],
+ status: [{
+ required: true,
+ message: '璇疯緭鍏ユ槸鍚︽敞閿�',
+ trigger: 'blur'
+ }],
+ isChange: [{
+ required: true,
+ message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+ trigger: 'blur'
+ }],
+ price: [{
+ required: true,
+ message: '璇疯緭鍏ラ噾棰�',
+ trigger: 'blur'
+ }],
+ incomeName: [{
+ required: true,
+ message: '璇疯緭鍏ユ敹鏀被鍒�',
+ trigger: 'blur'
+ }],
+ timeLimit: [{
+ required: true,
+ message: '璇疯緭鍏ユ湡闄�',
+ trigger: 'blur'
+ }],
+ location: [{
+ required: true,
+ message: '璇疯緭鍏ュ瓨鏀句綅缃�',
+ trigger: 'blur'
+ }],
+ propertyRight: [{
+ required: true,
+ message: '璇疯緭鍏ュ疄鐜伴毦搴�',
+ trigger: 'blur'
+ }],
+
+ remark: [{
+ // required: true,
+ message: '璇疯緭鍏ュ娉�',
+ trigger: 'blur'
+ }],
+ },
+ typeOptions: [{
+ value: 1,
+ label: '缁撴',
+ },
+ {
+ value: 0,
+ label: '鏈粨妗�',
+ }
+ ],
+
+ }
+ },
+ created() {
+ const id = this.$route.params && this.$route.params.id;
+ let jd;
+ if (this.$route.query.detail == 'true') {
+ jd = this.$route.query.detail
+ this.btn = jd
+ this.dsb = !jd
+ // document.title = "淇敼涓汉璐骇璇︾粏淇℃伅";
+ this.$route.meta.title = "浼氳缁熻璇︾粏淇℃伅"; //鍒楄〃鐨勫悕绉�
+ } else {
+ // document.title = "涓汉璐骇璇︾粏淇℃伅";
+ this.$route.meta.title = "浼氳缁熻璇︾粏淇℃伅"; //鍒楄〃鐨勫悕绉�
+ this.btn = false;
+ this.isShow = false
+ }
+
+ let _this = this
+ },
+ mounted() {},
+ methods: {
+ submitForm() {
+ 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
+
+ this.$refs['elForm'].validate(valid => {
+ alert(this.formData.status)
+ if (valid) {
+ if (this.formData.id != undefined) {
+ updateSelfEconomy(this.formData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.open = false;
+ if (this.formData.status == 1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
+ this.btn = false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+ if (this.formData.status == '鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
+ }
+ }
+ })
+ },
+ }
+ }
+</script>
+
+<style scoped>
+ .app-container {
+ background-color: #FEF7FC;
+ }
+
+ .mt {
+ position: relative;
+ }
+
+ .dt {
+ display: block;
+
+ }
+
+ .pt {
+ right: 10px;
+ top: -3px;
+ display: block;
+ position: absolute;
+ }
+
+ .form {
+ background: center/11% no-repeat url('../../assets/icons/form.png');
+ }
+
+ .hide /deep/ .el-upload--picture-card {
+ display: none;
+ }
+
+ .form_item {
+ font-size: 12px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+ font-weight: 400;
+ color: #000000;
+ }
+</style>
diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
index 5f57b82..dbcffcb 100644
--- a/ruoyi-ui/src/views/self/memoInfo.vue
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -220,6 +220,7 @@
fileList:[],
fileList1:[],
fileListOther:[],
+ fileListOther1:[],
uploadFileList:[],
uploadFileList1:[],
dsb:true,
@@ -299,7 +300,7 @@
if (id) {
this.loading = true;
getNote({id}).then((response) => {
-console.log(response.data , '6666666666')
+ console.log(response.data , '6666666666')
this.formData = response.data;
let paths = this.formData.url.split(",");
for(let i = 0; i < paths.length; i++)
@@ -337,6 +338,41 @@
},
mounted() {},
methods: {
+ getData(){
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getNote({id}).then((response) => {
+ // console.log(response.data , '6666666666')
+ this.formData = response.data;
+ let paths = this.formData.url.split(",");
+ for(let i = 0; i < paths.length; i++)
+ {
+ if(paths[i]!="") {
+
+ let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+
+ if (_this.fot.includes(pth) === true){
+ console.log()
+ } else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+ }
+
+ }
+ }
+ _this.fileListOther = _this.fileListOther1
+ this.loading = false;
+ });
+
+ }
+ },
+
submitForm() {
// let ul = this.fileList.map(function (elem){
// return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -499,7 +535,7 @@
this.fileList.push({name:file.name,url:file.url,res:true})
},
//鑷畾涔変笂浼犳柟娉�
- handleChange1(file, fileListOther1) {
+ handleChange1(file, fileListOther12) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
// this.uploadFileList.push(file.raw);
@@ -535,8 +571,11 @@
updateNote(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ this.getData();
+ this.fileListOther1=[]
});
})
+ // this.getData();
},
picUpload(){
--
Gitblit v1.9.1