From 2b0835030cc4a95319512841a14b6f60f18693de Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期四, 04 五月 2023 16:43:17 +0800
Subject: [PATCH] pet/index.js中删除了alert pet/petInfo.vue调用了查询getPetnoteList，之前调用接口调用错了
---
ruoyi-ui/src/views/self/show.vue | 229 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 130 insertions(+), 99 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index b7d0dd9..3f897d2 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -130,37 +130,13 @@
<div style="padding-left:30px;padding-top:30px" >
<el-container >
- <!-- <template slot-scope="scope" v-if="scope.row.roleId !== 1">-->
- <!-- <el-button-->
- <!-- size="mini"-->
- <!-- type="text"-->
- <!-- icon="el-icon-edit"-->
- <!-- @click="handleUpdate(scope.row)"-->
- <!-- v-hasPermi="['system:role:edit']"-->
- <!-- >淇敼</el-button>-->
-
- <!-- </template>-->
-
<el-row >
<el-button
type="primary"
- @click="handleUpdate(scope.row)"
- :disabled="btn"
+ @click="handleEdit()"
+ v-if="isShow"
v-hasPermi="['system:role:edit']"
>缂栬緫</el-button>
- <!-- @click="handleUpdate(scope.row)"-->
- <!-- <el-dropdown-->
- <!-- size="mini"-->
- <!-- @command="(command) => handleCommand(command, scope.row)"-->
- <!-- v-hasPermi="['system:role:edit']"> person:information:edit -->
- <!-- <el-button-->
- <!-- size="mini"-->
- <!-- type="text"-->
- <!-- icon="el-icon-d-arrow-right"-->
- <!-- @click="handleCheck(scope.row)"-->
- <!-- >鏌ョ湅璇︽儏</el-button>-->
-
- <!-- </el-dropdown>-->
<br>
<el-button
type="primary"
@@ -168,7 +144,7 @@
v-hasPermi="['family:note:export']"
>瀵煎嚭</el-button>
<br>
- <el-button type="primary" @click="submitForm" :disabled="dsb">瀹屾垚</el-button>
+ <el-button v-if="isShow_2" type="primary" @click="submitForm" :disabled="dsb">瀹屾垚</el-button>
</el-row>
</el-container>
@@ -233,19 +209,20 @@
<!--鎶樺彔闈㈡澘-->
<el-collapse v-model="activeNames" @change="handleChange">
- <el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1" >
- <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange">
+ <el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1">
+ <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="300" align="center" />
<el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" />
<el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" align="center" />
<!-- 鎿嶄綔-->
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
+<!-- @click="handleUpdate(scope.row)"-->
<el-button
size="mini"
type="text"
icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
+ @click="handleAdd"
v-hasPermi="['system:role:edit']"
>淇敼</el-button>
<el-button
@@ -264,7 +241,8 @@
</el-table>
</el-collapse-item>
<el-collapse-item title="瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�" name="2" >
- <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
+ :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="涓庢湰浜哄叧绯�" prop="relation" sortable width="260" align="center" />
<el-table-column label="濮撳悕" prop="nickName" sortable width="260" align="center" />
<el-table-column label="鍗曚綅鍙婅亴鍔�" prop="unit position" sortable width="260" align="center">
@@ -321,8 +299,9 @@
</div>
</el-collapse-item>
- <el-collapse-item title="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�" name="4" >
- <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange">
+ <el-collapse-item title="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�" name="4">
+ <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange"
+ :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="璇佷欢鍚嶇О" prop="cerName" sortable width="280" align="center" />
<el-table-column label="鎸佹湁鎯呭喌" prop="ownStatus" sortable width="280" align="center" />
<el-table-column label="璇佷欢鍙风爜" prop="idNo" sortable width="280" align="center" />
@@ -330,8 +309,9 @@
</el-table-column>
</el-table>
</el-collapse-item>
- <el-collapse-item title="鍑哄浗锛堝锛夋儏鍐�" name="5" >
- <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange">
+ <el-collapse-item title="鍑哄浗锛堝锛夋儏鍐�" name="5">
+ <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange"
+ :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="350" align="center" />
<el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination" sortable width="350" align="center" />
<el-table-column label="浜嬬敱锛堟梾娓搞�佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠栵級" prop="cause" sortable width="400" align="center" />
@@ -347,28 +327,35 @@
</el-container>
<el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange">
- <!-- <el-tab-pane label="鎬昏" name="0">-->
-
- <!-- </el-tab-pane>-->
- <!-- <div :model="AutobiographyList">-->
- <el-tab-pane label="0~3宀�(濠村効鏈�)" name="1" >
- <el-input v-model="AutobiographyList.content" prop="content" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
+ <el-tab-pane v-for="item in AutobiographyList" :key="item.id" :label="item.label" :name="item.id">
+ <div v-if="item.id === '1'">
+ // 鏄剧ず涓巌d涓�1鐨勫瓧鍏搁」鐩稿叧鐨勫唴瀹�
+ </div>
+ <div v-else-if="item.id === '2'">
+ // 鏄剧ず涓巌d涓�2鐨勫瓧鍏搁」鐩稿叧鐨勫唴瀹�
+ </div>
+ <div v-else>
+ // 鏄剧ず涓庡叾浠栧瓧鍏搁」鐩稿叧鐨勫唴瀹�
+ </div>
</el-tab-pane>
- <el-tab-pane label="6~12(灏忓)" name="2" ></el-tab-pane>
- <el-tab-pane label="12~15(鍒濅腑)" name="3"></el-tab-pane>
- <el-tab-pane label="15~18(楂樹腑)" name="4"></el-tab-pane>
- <el-tab-pane label="18~22(澶у)" name="5"></el-tab-pane>
- <el-tab-pane label="22~25(鐮旂┒鐢�)" name="6"></el-tab-pane>
- <el-tab-pane label="26~ (宸ヤ綔)" name="7"></el-tab-pane>
- <el-tab-pane label="锛熷瞾缁撳" name="8"></el-tab-pane>
- <!-- </div>-->
- <!-- <el-tab-pane-->
- <!-- v-for="(item, index) in AutobiographyTermList"-->
- <!-- :key="index"-->
- <!-- :name="item"-->
- <!-- :label="item"-->
- <!-- />-->
+<!-- <el-tab-pane label="0~3宀�(濠村効鏈�)" name="1" >-->
+<!--<!– <el-input v-model="AutobiographyList.content" prop="content" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">–>-->
+<!--<!– </el-input>–>-->
+<!-- </el-tab-pane>-->
+<!-- <el-tab-pane label="6~12(灏忓)" name="2" ></el-tab-pane>-->
+<!-- <el-tab-pane label="12~15(鍒濅腑)" name="3"></el-tab-pane>-->
+<!-- <el-tab-pane label="15~18(楂樹腑)" name="4"></el-tab-pane>-->
+<!-- <el-tab-pane label="18~22(澶у)" name="5"></el-tab-pane>-->
+<!-- <el-tab-pane label="22~25(鐮旂┒鐢�)" name="6"></el-tab-pane>-->
+<!-- <el-tab-pane label="26~ (宸ヤ綔)" name="7"></el-tab-pane>-->
+<!-- <el-tab-pane label="锛熷瞾缁撳" name="8"></el-tab-pane>-->
+<!-- <!– </div>–>-->
+<!-- <!– <el-tab-pane–>-->
+<!-- <!– v-for="(item, index) in AutobiographyTermList"–>-->
+<!-- <!– :key="index"–>-->
+<!-- <!– :name="item"–>-->
+<!-- <!– :label="item"–>-->
+<!-- <!– />–>-->
</el-tabs>
@@ -381,6 +368,30 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
+
+ <!-- 淇敼涓昏缁忓巻淇℃伅閰嶇疆瀵硅瘽妗� -->
+ <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px">
+ <el-form-item label="璧锋鏃ユ湡" prop="startDate">
+ <el-input v-model="formDat.startDate" placeholder="璇疯緭鍏ヨ捣姝㈡棩鏈�" clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
+ <el-form-item label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content">
+ <el-input v-model="formDat.content" placeholder="璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="璇佹槑浜�" prop="witness">
+ <el-input v-model="formDat.witness" placeholder="璇疯緭鍏ヨ瘉鏄庝汉" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+
+ </el-form>
+ <h4 class="form-header"> </h4>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitForm">淇� 瀛�</el-button>
+ <el-button @click="cancelData">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
@@ -404,9 +415,10 @@
getAutobiographyList,
getAutobiographyTermList,
getCertificateList
-} from '../../api/self'
+} from "@/api/self/index"
import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'
+import {getCategory} from "@/api/self/index";
export default {
name: "show",
@@ -447,6 +459,7 @@
//涓汉鑷紶
activeName: '0',
AutobiographyList:[],
+ content1:'',
//涓嶅悓鏃舵涓汉鑷紶
// AutobiographyTermList:[],
// // 璁块棶鍚庡彴鐨勬暟鎹�
@@ -484,8 +497,8 @@
],
dsb:true,
btn:false,
-
-
+ isShow:true,
+ isShow_2:false,
formDat: {
//涓汉鍩烘湰淇℃伅
nickName:undefined,
@@ -643,44 +656,24 @@
console.log(val);
},
- // edit(row){
- // const id= row.id;
- // this.reset();
- // this.title='缂栬緫涓汉淇℃伅';
- // this.$router.push('/self/self/edit/' + id);
- // },
//涓汉鑷紶
handleClick(tab, event) {
// console.log(tab, event);
this.getAutobiographyInfor();
- if(tab.name == 0) {
+ },
+
+ //闅旇鍙樿壊
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "statistics-warning-row1";
+ } else {
+ return "statistics-warning-row";
}
-
- //鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼�
- getAutobiographyTermList(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
- this.AutobiographyTermList = response.data;
- this.total = response.data.total;
- this.loading = false;
- });
-
- getAutobiographyList(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
- this.AutobiographyList = response.data;
- this.total = response.data.total;
- this.loading = false;
- });
},
-
-
/** 鏌ヨ瑙掕壊鍒楄〃 */
-
-
getList() {
this.loading = true;
// console.log(this.queryParams)
@@ -730,7 +723,22 @@
this.loading = false;
}
);
-
+ //鏌ヨ涓汉鎵�鏈夎嚜浼�
+ getAutobiographyList(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ this.AutobiographyList = response.data;
+ this.total = response.data.total;
+ this.loading = false;
+ });
+ //鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼�
+ getAutobiographyTermList(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ this.AutobiographyTermList = response.data;
+ this.total = response.data.total;
+ this.loading = false;
+ });
},
@@ -755,14 +763,14 @@
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.formDat.url = ul+","+uls
this.$refs['elForm'].validate(valid => {
if (valid) {
- if (this.formData.id != undefined) {
- updateIndividual(this.formData).then(response => {
+ if (this.formDat.id != undefined) {
+ updateIndividual(this.formDat).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
// this.open = false;
this.btn=false
@@ -846,7 +854,7 @@
alert(23)
},
handleRemove(file) {
- alert("鎿嶄綔鎴愬姛")
+ alert("323")
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
@@ -866,18 +874,26 @@
saveAs(blob, filename)
})
},
- //缂栬緫鎸夐挳
+ // 缂栬緫鎸夐挳
handleEdit()
{
this.dsb = false
this.btn = true
+ this.isShow=false
+ this.isShow_2=true
},
-
+ //淇敼鎸夐挳
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "淇敼璇︾粏淇℃伅";
+ },
/** 鏌ヨ鑷紶淇℃伅 */
getAutobiographyInfor()
{
let _this = this
- getAutobiography().then(response=>{
+ getCategory().then(response=>{
response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
_this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
@@ -958,7 +974,7 @@
};
</script>
-<style scoped>
+<style >
/*.uoloadSty {*/
/* width:110px;*/
/* height:110px;*/
@@ -967,10 +983,25 @@
/*.disUoloadSty {*/
/* display:none; !* 涓婁紶鎸夐挳闅愯棌 *!*/
/*}*/
-
-.el-icon-top {
- background: url("/src/assets/icons/top.png");
+.app-container{
+ background-color: #FEF7FC;
}
+.el-icon-top {
+ background: no-repeat center url("../../assets/icons/top.png");
+}
+.el-table__row.statistics-warning-row {
+ background: #E0EEFE;
+}
+.el-table__row.statistics-warning-row1 {
+ background: #FFEFF2;
+
+}
+/*.co-item{*/
+/* background-color: #EBAFB4;*/
+/*}*/
+.el-collapse-item__header {
+ background-color:#FEF7FC;
+}
</style>
--
Gitblit v1.9.1