From 9596bd25e3c95906398149d9325bbeecaa570e20 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 09 五月 2023 16:24:15 +0800
Subject: [PATCH] 根据反馈情况修改了部分bug
---
ruoyi-ui/src/views/collection/collectionInfo.vue | 75 ++++++++++++++++--
ruoyi-ui/src/views/contacts/index.vue | 8 +-
ruoyi-ui/src/views/homeRoot/index.vue | 58 ++++++++++++++
ruoyi-ui/src/views/doctor/doctorInfo.vue | 16 ++-
ruoyi-ui/src/views/contacts/contactsInfo.vue | 11 +-
ruoyi-ui/src/views/collection/index.vue | 8 +
ruoyi-ui/src/views/doctor/index.vue | 6
7 files changed, 153 insertions(+), 29 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index e5b1c68..db41a4d 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<div class="form-header mt">
<h4 class="dt h4">鏀惰棌涓庤崳瑾夎缁嗕俊鎭� </h4>
- <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>
+<!-- <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
<!-- <br>-->
<!-- <el-button type="primary" class="pt" @click="handleExport"-->
<!-- v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
@@ -14,7 +14,7 @@
<!-- clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">
- <el-input v-model="formData.type" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
@@ -64,22 +64,23 @@
fit="cover"
:preview-src-list="[file.url]"
>
- <span class="el-upload-list__item-actions">
+ <span class="el-upload-list__item-actions" >
<span
+ v-if="isShow"
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="!disabled"
+ v-if="isShow"
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
<i class="el-icon-download"></i>
</span>
<span
- v-if="!disabled"
+ v-if="isShow"
class="el-upload-list__item-delete"
@click="handleRemove(file)"
>
@@ -91,7 +92,7 @@
</div>
</el-upload>
- <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+ <!--<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
:file-list="fileListOther"
@@ -103,17 +104,68 @@
:http-request="requestUpload"
:show-file-list="true"
>
- <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <el-button v-if="isShow" type="primary" >鐐瑰嚮涓婁紶</el-button>
<template #tip>
<div class="el-upload__tip">
</div>
</template>
+ </el-upload>-->
+ <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+ <el-upload
+ action=""
+ :file-list="fileListOther"
+ class="upload-demo"
+ multiple
+ list-type="picture-card"
+ :on-preview="handleFileCardPreview"
+ :on-remove="handleRemove"
+ :http-request="requestUpload"
+ :show-file-list="true"
+ >
+
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/401_images/401.gif"
+ alt=""
+ style="width: 147px; height: 147px"
+ fit="cover"
+ >
+ <span class="el-upload-list__item-actions">
+ <span v-if="isShow"
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+ v-if="isShow"
+ @click="handleRemove(file)"
+ class="el-upload-list__item-delete"
+
+ >
+ <i class="el-icon-download"></i>
+ </span>
+ <span
+ v-if="isShow"
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+
+ </div>
+
+
</el-upload>
<el-form-item size="large">
- <el-button type="primary" @click="submitForm" :disabled="dsb" >淇敼</el-button>
+ <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb" >淇敼</el-button>
</el-form-item>
</el-form>
@@ -228,6 +280,7 @@
else{
document.title = "鏌ョ湅鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";
this.$route.meta.title = "鏌ョ湅鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
+ this.isShow=false
}
let _this = this
@@ -319,6 +372,12 @@
handleRemove(file) {
alert(323)
},
+ handleFileCardPreview(file){
+ this.dialogFileUrl = file.url;
+ const Base64 = require('js-base64').Base64
+ this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+ myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+ },
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 9040293..13760c7 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -85,10 +85,10 @@
</el-form-item>
</el-col>
</el-cntainer>
- <el-form-item label="鎸佹湁鑰�" prop="owner" >
+ <el-form-item label="鎷ユ湁鑰�" prop="owner" >
<el-input
v-model="queryParams.owner"
- placeholder="璇疯緭鍏ユ寔鏈夎��"
+ placeholder="璇疯緭鍏ユ嫢鏈夎��"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery">
@@ -224,7 +224,7 @@
</template>
</el-table-column>
- <el-table-column label="澶囨敞" prop="remark" sortable width="140" align="center">
+ <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
@@ -252,6 +252,7 @@
type="text"
icon="el-icon-d-arrow-right"
@click="handleCheck(scope.row)"
+
>鏌ョ湅璇︽儏</el-button>
</el-dropdown>
@@ -638,6 +639,7 @@
handleCheck(row){
const id = row.id;
this.$router.push("/familymodel/collection/collectionInfo/" + id);
+
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index 2011fab..8c5959b 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<div class="form-header mt">
<h4 class="dt h4">閫氳褰曡缁嗕俊鎭� </h4>
- <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>
+<!-- <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
<!-- <br>-->
<!-- <el-button type="primary" class="pt" @click="handleExport"-->
<!-- v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
@@ -73,20 +73,21 @@
>
<span class="el-upload-list__item-actions">
<span
+ v-if="isShow"
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="!disabled"
+ v-if="isShow"
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
<i class="el-icon-download"></i>
</span>
<span
- v-if="!disabled"
+ v-if="isShow"
class="el-upload-list__item-delete"
@click="handleRemove(file)"
>
@@ -101,7 +102,7 @@
<el-form-item size="large">
- <el-button type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
+ <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
</el-form-item>
</el-form>
@@ -203,12 +204,14 @@
jd = this.$route.query.detail
this.btn= jd
this.dsb = !jd
+ this.isShow=true
document.title = "淇敼閫氳褰曡缁嗕俊鎭�";
this.$route.meta.title = "淇敼閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
}
else{
document.title = "鏌ョ湅閫氳褰曡缁嗕俊鎭�";
this.$route.meta.title = "鏌ョ湅閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
+ this.isShow=false
}
let _this = this
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index c187f35..9bb9656 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -196,7 +196,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url !== null"
+ v-if="scope.row.url !== ','"
>
<img
class="el-upload-list__item-thumbnail"
@@ -204,7 +204,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url === null"
+ v-if="scope.row.url === ','"
>
</template>
</el-table-column>
@@ -254,7 +254,7 @@
@pagination="getList"
/>
-
+
<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">
@@ -359,7 +359,7 @@
<h4 class="form-header"> </h4>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
+ <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
diff --git a/ruoyi-ui/src/views/doctor/doctorInfo.vue b/ruoyi-ui/src/views/doctor/doctorInfo.vue
index 71c7098..ceeb783 100644
--- a/ruoyi-ui/src/views/doctor/doctorInfo.vue
+++ b/ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<div class="form-header mt">
<h4 class="dt h4">灏卞尰璁板綍璇︾粏淇℃伅 </h4>
- <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>
+<!-- <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
<!-- <br>-->
<!-- <el-button type="primary" class="pt" @click="handleExport"-->
<!-- v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
@@ -66,20 +66,21 @@
>
<span class="el-upload-list__item-actions">
<span
+ v-if="isShow"
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="!disabled"
+ v-if="isShow"
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
<i class="el-icon-download"></i>
</span>
<span
- v-if="!disabled"
+ v-if="isShow"
class="el-upload-list__item-delete"
@click="handleRemove(file)"
>
@@ -115,13 +116,14 @@
>
<span class="el-upload-list__item-actions">
<span
+ v-if="isShow"
class="el-upload-list__item-preview"
@click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="!disabled"
+ v-if="isShow"
@click="handleRemove(file)"
class="el-upload-list__item-delete"
@@ -129,7 +131,7 @@
<i class="el-icon-download"></i>
</span>
<span
- v-if="!disabled"
+ v-if="isShow"
class="el-upload-list__item-delete"
@click="handleRemoveFile(file)"
>
@@ -144,7 +146,7 @@
</el-upload>
<el-form-item size="large">
- <el-button type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
+ <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
</el-form-item>
</el-form>
@@ -253,12 +255,14 @@
jd = this.$route.query.detail
this.btn= jd
this.dsb = !jd
+ this.isShow=true
document.title = "淇敼灏卞尰璁板綍璇︾粏淇℃伅";
this.$route.meta.title = "淇敼灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
document.title = "鏌ョ湅灏卞尰璁板綍璇︾粏淇℃伅";
this.$route.meta.title = "鏌ョ湅灏卞尰璁板綍璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.isShow=false
}
let _this = this
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index f8528d2..ca64741 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -215,7 +215,7 @@
<el-table-column label="澶囨敞" prop="remark" sortable width="120" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="80" >
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="140" align="center">
<template slot-scope="scope" >
<img
class="el-upload-list__item-thumbnail"
@@ -223,7 +223,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url !== null"
+ v-if="scope.row.url !== ','"
>
<img
class="el-upload-list__item-thumbnail"
@@ -231,7 +231,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url === null"
+ v-if="scope.row.url === ','"
>
</template>
</el-table-column>
diff --git a/ruoyi-ui/src/views/homeRoot/index.vue b/ruoyi-ui/src/views/homeRoot/index.vue
index 3ddd6e1..8db644c 100644
--- a/ruoyi-ui/src/views/homeRoot/index.vue
+++ b/ruoyi-ui/src/views/homeRoot/index.vue
@@ -225,7 +225,63 @@
url:undefined,
familyId:undefined,
secondFamilyId: undefined,
- childList:undefined
+ childList:[{
+ userId: undefined,
+ nickName: undefined,
+ oldName: undefined,
+ sex: undefined,
+ nationality: undefined,
+ nation: undefined,
+ maritalStatus: undefined,
+ politicalOutlook: undefined,
+ phoneNumber:undefined,
+ idNum: undefined,
+ locationAddress: undefined,
+ alwaysAddress:undefined,
+ locationPolice: undefined,
+ alwaysPolice: undefined,
+ unit: undefined,
+ position:undefined,
+ outStatus:undefined,
+ idNo: undefined,
+ img: undefined,
+ spouseId: undefined,
+ fatherId: undefined,
+ momId: undefined,
+ birth: undefined,
+ url:undefined,
+ familyId:undefined,
+ secondFamilyId: undefined,
+ childList:[{
+ userId: undefined,
+ nickName: undefined,
+ oldName: undefined,
+ sex: undefined,
+ nationality: undefined,
+ nation: undefined,
+ maritalStatus: undefined,
+ politicalOutlook: undefined,
+ phoneNumber:undefined,
+ idNum: undefined,
+ locationAddress: undefined,
+ alwaysAddress:undefined,
+ locationPolice: undefined,
+ alwaysPolice: undefined,
+ unit: undefined,
+ position:undefined,
+ outStatus:undefined,
+ idNo: undefined,
+ img: undefined,
+ spouseId: undefined,
+ fatherId: undefined,
+ momId: undefined,
+ birth: undefined,
+ url:undefined,
+ familyId:undefined,
+ secondFamilyId: undefined,
+ childList:undefined
+ }]
+ }]
}
}
--
Gitblit v1.9.1