From 1beebc6d565aacfae90235d14bcd4ad79aa4e79d Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 01 八月 2023 01:33:40 +0800
Subject: [PATCH] 完善相应模块的电子文件与详情显示问题
---
ruoyi-ui/src/views/honor/index.vue | 47 ++++++++-------
ruoyi-ui/src/views/self/memo.vue | 29 ++++++---
ruoyi-ui/src/views/self/memoInfo.vue | 28 +++++---
ruoyi-ui/src/views/honor/honorInfo.vue | 12 ++--
ruoyi-ui/src/api/memo/index.js | 8 ++
ruoyi-ui/src/views/wish/index.vue | 2
ruoyi-ui/src/views/doctor/index.vue | 33 +++++-----
7 files changed, 92 insertions(+), 67 deletions(-)
diff --git a/ruoyi-ui/src/api/memo/index.js b/ruoyi-ui/src/api/memo/index.js
index 07ed13e..17bdbd8 100644
--- a/ruoyi-ui/src/api/memo/index.js
+++ b/ruoyi-ui/src/api/memo/index.js
@@ -9,6 +9,14 @@
})
}
+// 鏍规嵁id鏌ヨ璁板綍
+export function getNote(query) {
+ return request({
+ url: '/zSelfNote',
+ method: 'get',
+ params: query
+ })
+}
//鏂板璁板綍
export function addNote(data)
{
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index e098f5e..5ca2704 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -224,22 +224,23 @@
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
<template slot-scope="scope" >
<div @click="handleCheck(scope.row)">
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceLis.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url !== ','"
- >
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceA.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url ===',' "
- ></div>
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+ >
+ <img
+ v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+
+ ></div>
</template>
</el-table-column>
diff --git a/ruoyi-ui/src/views/honor/honorInfo.vue b/ruoyi-ui/src/views/honor/honorInfo.vue
index 8003196..20a6cf7 100644
--- a/ruoyi-ui/src/views/honor/honorInfo.vue
+++ b/ruoyi-ui/src/views/honor/honorInfo.vue
@@ -17,12 +17,12 @@
<div>
<el-container>
<el-row>
- <el-cow :span="8">
- <el-form-item label="鏃堕棿" prop="createTime" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.createTime" placeholder="璇疯緭鍏ユ椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-cow>
+<!-- <el-cow :span="8">-->
+<!-- <el-form-item label="鏃堕棿" prop="createTime" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">-->
+<!-- <el-input v-model="formData.createTime" placeholder="璇疯緭鍏ユ椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">-->
+<!-- </el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-cow>-->
<el-cow :span="8">
<el-form-item label="绫诲埆" prop="type" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="formData.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" :disabled="dsb">
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 1700415..79a32e1 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -179,10 +179,10 @@
<el-table v-loading="loading" :data="honorList" :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="25" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
- <el-table-column label="鏃堕棿" prop="createTime" sortable width="120" align="center">
+<!-- <el-table-column label="鏃堕棿" prop="createTime" sortable width="120" align="center">-->
- <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
+<!-- <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>-->
+<!-- </el-table-column>-->
<el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center" >
<!-- <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>-->
<template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>
@@ -208,22 +208,23 @@
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
<template slot-scope="scope" >
<div @click="handleCheck(scope.row)">
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceLis.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url !== ','"
- >
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceA.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url ===',' "
- ></div>
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+ >
+ <img
+ v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+
+ ></div>
</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="remark" sortable width="120" align="center">
@@ -270,10 +271,10 @@
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
- <el-form-item label="鏃堕棿" prop="createTime">
- <el-input v-model="formDat.createTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
+<!-- <el-form-item label="鏃堕棿" prop="createTime">-->
+<!-- <el-input v-model="formDat.createTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >-->
+<!-- </el-input>-->
+<!-- </el-form-item>-->
<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
<!-- <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>-->
<!-- </el-form-item>-->
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index f834056..5fb73e6 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -1,15 +1,21 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
- <el-input
- v-model:phone="queryParams.phone"
- placeholder="鍦ㄢ�滀釜浜鸿浜嬫湰鈥濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+<!-- -->
+<!-- <el-input-->
+<!-- v-model:phone="queryParams.phone"-->
+<!-- placeholder=""-->
+<!-- clearable-->
+<!-- style="width: 240px"-->
+<!-- @keyup.enter.native="handleQuery">-->
+<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
+<!-- </el-input>-->
+<!-- -->
+ <el-form-item label="" prop="address title remark people happenTime" >
+ <el-input v-model="keyword" placeholder="鍦ㄢ�滀釜浜鸿浜嬫湰鈥濅腑鎼滅储" clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</el-form-item>
<el-form-item label="鏃堕棿" prop="happenTime">
@@ -360,7 +366,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ keyword:'',
formDat: {
//涓汉璁颁簨鏈鎯�
id:undefined,
@@ -383,7 +389,7 @@
people:undefined,
address:undefined,
title:undefined,
-
+ remark:undefined
},
// searchVal:"",
@@ -432,6 +438,7 @@
// this.formDat[i] = this.contactList[i];
// }
},
+
methods: {
// 鍙栨秷鎸夐挳
cancelData() {
diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
index 21819a2..f7dc743 100644
--- a/ruoyi-ui/src/views/self/memoInfo.vue
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -1,7 +1,9 @@
<template>
<div class="app-container">
<div class="form-header mt">
- <h4 class="dt h4">涓汉璁颁簨鏈缁嗕俊鎭� </h4>
+ <el-page-header @back="goBack" content="涓汉璁颁簨鏈缁嗕俊鎭�">
+ </el-page-header>
+<!-- <h4 class="dt h4"> </h4>-->
</div>
<div>
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
@@ -97,7 +99,7 @@
multiple
list-type="picture-card"
:on-preview="handleFileCardPreview"
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -121,11 +123,10 @@
</span>
<span
v-if="isShow"
- @click="handleRemove(file)"
class="el-upload-list__item-delete"
-
+ @click="handleDownload(file.url)"
>
- <i class="el-icon-download"></i>
+ <i class="el-icon-download"></i>
</span>
<span
v-if="isShow"
@@ -168,14 +169,12 @@
cdi:"涓汉璁颁簨鏈鎯�",
udi:"涓汉璁颁簨鏈鎯�",
fot:[".jpg",".jif","png"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
isShow:true,
+
// 涓浜嬫湰琛ㄦ牸鏁版嵁
noteList: [],
formData: {
@@ -245,7 +244,7 @@
let _this = this
if (id) {
this.loading = true;
- getNote(id).then((response) => {
+ getNote({id}).then((response) => {
this.formData = response.data;
let paths = response.data.url.split(",");
for(let i = 0; i < paths.length; i++)
@@ -308,6 +307,7 @@
}
}
})
+ this.goBack()
},
resetForm() {
this.$refs['elForm'].resetFields()
@@ -362,12 +362,18 @@
saveAs(blob, filename)
})
},
+ goBack() {
+ this.$router.go(-1);
+ this.$router.push({ path: "/self/self/memo" });
+ },
+
handleEdit()
{
this.dsb = false
// this.btn = true
this.isShow=false
},
+
requestUpload(params)
{
var file = params.file;
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 76cc954..156fa08 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -65,6 +65,7 @@
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
+ @keyup.enter.native="handleQuery"
></el-date-picker>
</el-form-item>
@@ -794,6 +795,7 @@
/** 瀵煎叆妯℃澘涓嬭浇鎸夐挳鎿嶄綔 */
handleExportModel() {
+
this.download('/zIdea/model', {
}, `zIdea_model_${new Date().getTime()}.xlsx`)
},
--
Gitblit v1.9.1