From ef05f1416c204098f003c3f4c3861354d18cd503 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期六, 24 八月 2024 13:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/self/memo.vue | 1004 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 509 insertions(+), 495 deletions(-)
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 5fb73e6..7a32f90 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -1,324 +1,269 @@
<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-<!-- -->
-<!-- <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">
- <el-date-picker
- v-model="dateRange"
- style="width: 197px;
- height: 30px;
- background: #FFFFFF;
- border-radius: 14px 14px 14px 14px;
- opacity: 0.5;
- border: 1px solid rgba(0,0,0,0.25);"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- @keyup.enter.native="handleQuery"
- ></el-date-picker>
- </el-form-item>
- <el-form-item label="浜虹墿" prop="people">
- <el-input
- v-model="queryParams.people"
- 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="address">
- <el-input
- v-model="queryParams.address"
- 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="title">
- <el-input
- v-model="queryParams.title"
- 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>
- <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
- border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
- <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
- border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
- <div>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
+ <div class="app-container" id="printable-content">
+ <h1 style="font-size:21px;padding-top:30px;display: flex;">
+ <span>涓汉绠�鍘�</span>
+ <div class="button-container" >
<el-button
- type="primary"
- plain
- icon="el-icon-plus"
size="mini"
- @click="handleAdd"
- v-hasPermi="['system:role:add']"
- >鏂板</el-button>
- </el-col>
+ style="background: #E0EEFE;
+ border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;"
+ @click="handleEdit()"
+ v-if="isShow"
+ v-hasPermi="['system:role:edit']"
+ >缂栬緫</el-button>
+ <el-button v-if="isShow_2" size="mini"
+ style=" width: 67px;height: 27px;background:#E0EEFE;
+ border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; "@click="submitForm" :disabled="dsb">瀹屾垚</el-button>
- <el-col :span="1.5">
<el-button
- type="danger"
- plain
- icon="el-icon-delete"
size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
+ style=" width: 67px;height: 27px;background: #D2F3E0;
+ border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; "
@click="handleExport"
v-hasPermi="['family:note:export']"
>瀵煎嚭</el-button>
- </el-col>
- <el-col :span="1.5">
+
<el-button
- type="warning"
- plain
- icon="el-icon-download"
size="mini"
- @click="handleExportTemplate"
+ style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;"
+ v-print="'#printable-content'"
v-hasPermi="['family:note:export']"
- >瀵煎叆妯℃澘涓嬭浇</el-button>
- </el-col>
- <el-col :span="1.2">
-
- <el-upload
- action=""
-
- class="upload-demo"
- :show-file-list="false"
- :http-request="handleEnport"
- >
- <el-button size="mini" type="primary"
- plain
- icon="el-icon-plus" >瀵煎叆</el-button>
-
- </el-upload>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
- </div>
-
- <el-table v-loading="loading" :data="noteList" :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="happenTime" sortable :show-overflow-tooltip="true" width="150" align="center" >
- <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
- <el-table-column label="浜虹墿" prop="people" sortable :show-overflow-tooltip="true" width="150" align="center" >
- <template slot-scope="scope">{{scope.row.people? scope.row.people: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
- <el-table-column label="鍦扮偣" prop="address" sortable width="160" align="center" >
- <template slot-scope="scope">{{scope.row.address? scope.row.address: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
- <el-table-column label="浜嬩欢鏍囬" prop="title" sortable width="160" align="center">
- <template slot-scope="scope">{{scope.row.title? scope.row.title: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
- <el-table-column label="澶囨敞" prop="remark" sortable width="150" align="center">
- <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
- <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 === ',' || 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>-->
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <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>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
-
- <el-button
- size="mini"
- type="text"
- icon="el-icon-d-arrow-right"
- @click="handleCheck(scope.row)">
- 鏌ョ湅璇︽儏</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- style="background: #FEF7FC;"
- @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">
-
- <el-form-item label="鏃堕棿" prop="happenTime">
- <el-input v-model="formDat.happenTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
- </el-form-item>
- <el-form-item label="浜虹墿" prop="people">
- <el-input v-model="formDat.people" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" >
- </el-input>
- </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="title">
- <el-input v-model="formDat.title" placeholder="璇疯緭鍏ユ椂闂存爣棰�" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
-
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
- </el-form-item>
-
- <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
- <el-upload
- action="#"
- list-type="picture-card"
- multiple
- :http-request="requestUpload"
- :file-list="fileList"
- >
- <i slot="default" class="el-icon-plus"></i>
- <div slot="file" slot-scope="{file}">
- <img
- class="el-upload-list__item-thumbnail"
- :src="file.url"
- alt=""
- style="width: 126px; height: 126px"
- fit="cover"
- :preview-src-list="[file.url]"
- >
- <span class="el-upload-list__item-actions">
- <span
- class="el-upload-list__item-preview"
- @click="handlePictureCardPreview(file)"
- >
- <i class="el-icon-zoom-in"></i>
- </span>
-
- <span
- v-if="!disabled"
- class="el-upload-list__item-delete"
- @click="handleRemove(file)"
- >
- <i class="el-icon-delete"></i>
- </span>
- </span>
-
-
- </div>
- </el-upload>
- <h4 class="form-header">鍏朵粬闄勪欢 </h4>
- <el-upload
- action=""
- :file-list="fileListOther"
- class="upload-demo"
- multiple
-
- :on-remove="handleRemove"
- :http-request="requestUpload"
- :show-file-list="true"
- >
- <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
- <template #tip>
- <div class="el-upload__tip">
- </div>
- </template>
- </el-upload>
-
- </el-form>
- <h4 class="form-header"> </h4>
-
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
- <el-button @click="cancelData">鍙� 娑�</el-button>
+ >鎵撳嵃</el-button>
</div>
- </el-dialog>
- <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+ </h1>
+ <el-divider />
+ <h2 style="font-size:16px">鍩烘湰淇℃伅</h2>
+ <el-container>
+ <div >
+ <el-container>
+ <el-col >
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"
+ v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
+ <el-row :span="6">
+ <el-form-item label="濮撳悕" prop="nickName" label-width="40px">
+ <el-input v-model="individualList.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="6">
+ <el-form-item label="鏇剧敤鍚�" prop="oldName" label-width="60px">
+ <el-input v-model="individualList.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="6">
+ <el-form-item label="韬唤璇佸彿" prop="idNum" label-width="70px">
+ <el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ </el-form>
+ </el-col>
+ </el-container>
+ </div>
+ <div style="padding-left:60px">
+ <el-container>
+ <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
+ <el-row :span="5">
+ <el-form-item label="鎬у埆" prop="sex" label-width="40px">
+<!-- <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">-->
+<!-- </el-input>-->
+ <template v-if="!isEditing">
+ <el-input v-model="individualList.sex === 1 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </template>
+ <template v-else>
+ <el-select v-model="inds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-option label="鐢�" value='1'></el-option>
+ <el-option label="濂�" value='0'></el-option>
+ </el-select>
+ </template>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="姘戞棌" prop="nation"label-width="40px">
+ <el-input v-model="individualList.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber" label-width="70px">
+ <el-input v-model="individualList.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ </el-form>
+ </el-col>
+ </el-container>
+ </div>
+ <div style="padding-left:60px">
+ <el-container>
+ <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left":disabled="dsb">
+ <el-row :span="5">
+ <el-form-item label="鍥界睄" prop="nationality" label-width="40px">
+ <el-input v-model="individualList.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="5">
+ <el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="70px">
+ <template v-if="!isEditing" >
+ <el-input v-if="individualList.maritalStatus===0" placeholder="鏈"></el-input>
+ <el-input v-if="individualList.maritalStatus===1" placeholder="宸插"></el-input>
+ <el-input v-if="individualList.maritalStatus===2" placeholder="鏈"></el-input>
- </el-dialog>
+ </template>
+ <template v-else>
+ <el-select v-model="mrs" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}">
+ <el-option label="鏈" value='0'></el-option>
+ <el-option label="宸插" value='1'></el-option>
+ <el-option label="绂诲" value='2'></el-option>
+ </el-select>
+ </template>
+ </el-form-item>
+ </el-row>
- </div>
+ </el-form>
+ </el-col>
+ </el-container>
+ </div>
+ <div style="padding-left:100px;padding-top:30px">
+ <el-col :span="6" :data="individualList">
+ <div class="block" :model="individualList">
+
+
+
+
+ <el-upload ref="uploadDemo"
+ action=""
+ :file-list="fileList"
+ list-type="picture-card"
+ accept="image/*"
+ :multiple="false"
+ :http-request="requestUpload"
+ :on-success="handleSucess"
+ :limit="1">
+
+ <el-avatar shape="square" style="width: 200px;;height: 200px;" >
+ <el-image
+ :src="'https://www.bendudu.com:8080/'+ individualList.url"
+ :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
+ ></el-image>
+
+
+ </el-avatar>
+ </el-upload>
+ </div>
+ </el-col>
+
+ </div>
+
+ <div style="padding-left:30px;padding-top:30px" >
+
+ </div>
+ <!-- </el-dialog> self:user:export-->
+ </el-container>
+ <el-container>
+ <div>
+ <el-container>
+ <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
+ <el-row :span="16" >
+ <el-form-item label="鍗曚綅" prop="unit" label-width="40px">
+ <el-input v-model="individualList.unit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="16">
+ <el-form-item label="鎴风睄鍦板潃" prop="locationAddress" label-width="70px">
+ <el-input type="textarea" v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
+ <el-row :span="28">
+ <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="70px">
+ <el-input type="textarea" v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
+
+ </el-form>
+ </el-col>
+ </el-container>
+ </div>
+ <div style="padding-left:60px">
+ <el-container>
+ <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
+ <el-row :span="12" >
+ <el-form-item label="鑱屽姟鑱岀О" prop="position" label-width="70px">
+ <el-input v-model="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="12">
+ <el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="locationPolice" label-width="110px">
+ <el-input type="textarea" v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="12">
+ <el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop="alwaysPolice" label-width="110px">
+ <el-input type="textarea" v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
+ </el-form>
+ </el-col>
+ </el-container>
+ </div>
+ </el-container>
+ <!--鎶樺彔闈㈡澘-->
+ <el-collapse >
+ <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" >
+ <div>
+ <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
+ <el-form-item label="鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�" >
+ <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0;color: #FEF7FC;" :disabled="dsb">
+ <el-radio :label="1">鏄�</el-radio>
+ <el-radio :label="0">鍚�</el-radio>
+ </el-radio-group>
+ <el-container >
+ <el-row :span="7">
+ <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
+ <el-form-item label="璇佷欢鍙风爜" prop="idNo" label-width="70px">
+ <el-input v-model="individualList.idNo" style="color: #FEF7FC;" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-form>
+ </el-row>
+ </el-container>
+ </el-form-item>
+ </el-form>
+
+ </div>
+
+ </el-collapse-item>
+ </el-collapse>
+ </div>
</template>
<script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
-//瀵煎叆鎺ュ彛鍑芥暟
+import {
+ getIndividualList, addIndividual, updateIndividual, delIndividual,
+ listExperience, addExperience, updateExperience, delExperience,
+ getIndividualRelation, addRelation, updateRelation, delRelation,
+ getCertificateList, addCertificate, updateCertificate, delCertificate,
+ getAbroadList, addAbroad, updateAbroad, delAbroad, listType,
+ getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
+ getCategory,
+} from "@/api/self/index";
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
@@ -329,11 +274,14 @@
return {
// 閬僵灞�
disabled: false,
-
+ inds:undefined,
+ //濠氬Щ绫诲埆
+ mrs:undefined,
loading: true,
formData:[],
// 閫変腑鏁扮粍
ids: [],
+ fit:['cover'],
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -358,15 +306,110 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
+ fileList:[],
+ fileListOther:[],
- ],
- dsb:true,
- btn:false,
+ uploading: false,
+ uploading1: false,
fit:['fill'],
keyword:'',
+ rules: {
+ //鍩烘湰淇℃伅
+ nickName: [{
+ // required: true,
+ message: '璇疯緭鍏ュ鍚�',
+ trigger: 'blur'
+ }],
+ oldName: [{
+ // required: true,
+ message: '璇疯緭鍏ユ浘鐢ㄥ悕',
+ trigger: 'blur'
+ }],
+ idNum: [{
+ // required: true,
+ message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
+ trigger: 'blur'
+ }],
+ nationality: [{
+ // required: true,
+ message: '璇疯緭鍏ュ浗绫�',
+ trigger: 'blur'
+ }],
+ maritalStatus: [{
+ // required: true,
+ message: '璇疯緭鍏ュ濮荤姸鍐�',
+ trigger: 'blur'
+ }],
+ locationAddress: [{
+ // required: true,
+ message: '璇疯緭鍏ユ埛绫嶅湴鍧�',
+ trigger: 'blur'
+ }],
+ alwaysAddress: [{
+ // required: true,
+ message: '璇疯緭鍏ュ父浣忓湴鍧�',
+ trigger: 'blur'
+ }],
+ unit: [{
+ // required: true,
+ message: '璇疯緭鍏ュ崟浣�',
+ trigger: 'blur'
+ }],
+ position: [{
+ // required: true,
+ message: '璇疯緭鍏ヨ亴鍔¤亴绉�',
+ trigger: 'blur'
+ }],
+ locationPolice: [{
+ // required: true,
+ message: '璇疯緭鍏ユ埛绫嶅湴鍏畨鏈哄叧',
+ trigger: 'blur'
+ }],
+ alwaysPolice: [{
+ // required: true,
+ message: '璇疯緭鍏ュ父浣忓湴鍏畨鏈哄叧',
+ trigger: 'blur'
+ }],
+
+ //涓昏瀛︿範鍙婂伐浣滅粡鍘�
+ startDate: [{
+ required: true,
+ message: '璇疯緭鍏ヨ捣濮嬫棩鏈�',
+ trigger: 'blur'
+ }],
+ endDate: [{
+ // required: true,
+ message: '璇疯緭鍏ョ粨鏉熸棩鏈�',
+ trigger: 'blur'
+ }],
+ content: [{
+ required: true,
+ message: '璇疯緭鍏ユ枃鏈�',
+ trigger: 'blur'
+ }],
+ witness: [{
+ required: true,
+ message: '璇疯緭鍏ヨ瘉鏄庝汉',
+ trigger: 'blur'
+ }],
+ //鑷紶
+ term: [{
+ required: true,
+ message: '璇疯緭鍏ユ椂鏈�',
+ trigger: 'blur'
+ }],
+ ageBegin: [{
+ required: true,
+ message: '',
+ trigger: 'blur'
+ }],
+ ageEnd: [{
+ required: true,
+ message: '',
+ trigger: 'blur'
+ }],
+
+ },
formDat: {
//涓汉璁颁簨鏈鎯�
id:undefined,
@@ -377,6 +420,7 @@
remark:undefined,
url: undefined,
},
+ individualList:[],
// 鑿滃崟鍒楄〃
menuOptions: [],
// 閮ㄩ棬鍒楄〃
@@ -429,66 +473,44 @@
}],
},
typeOptions: [],
+ isShow:true,
+ dsb:true,
+ btn: false,
+ isShow_2:false,
+ isEdit1:false,
+ isEditing: false,
+ fileList:[]
};
},
created() {
this.getList();
- this.getCateInfor()
+
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
},
methods: {
- // 鍙栨秷鎸夐挳
- cancelData() {
- this.open = false;
- this.reset();
- },
- //闅旇鍙樿壊
- tableRowClassName({ row, rowIndex }) {
- if (rowIndex % 2 == 0) {
- return "statistics-warning-row1";
- } else {
- return "statistics-warning-row";
- }
- },
+
+
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
- this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
- this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
- // console.log(this.queryParams)
- // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- listNote(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
- this.noteList = response.data.data;
-
- this.total = response.data.total;
- this.loading = false;
- }
- );
- },
- /** 鏌ヨ绫诲埆淇℃伅 */
- getCateInfor()
- {
let _this = this
- getCategory().then(response=>{
+ //涓汉淇℃伅
+ getIndividualList(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ _this.individualList = response.data;
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- })
- })
+ // this.total = response.data.total;
+ _this.loading = false;
+ }
+ );
},
- handleRemove(file) {
- for(let i = 0; i < this.fileList.length; i++)
- {
- if(this.fileList[i].url==file.url)
- this.$delete(this.fileList,i);
- }
- },
+
+
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -498,124 +520,93 @@
{
return row.id
},
- // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
- cancelDataScope() {
- this.openDataScope = false;
- this.reset();
+ // 缂栬緫鎸夐挳
+ handleEdit()
+ {
+ this.dsb = false
+ this.btn = true
+ this.isShow=false
+ this.isShow_2=true
+ this.isEditing=true
+ if(this.individualList.maritalStatus == 0)
+ this.mrs = '鏈'
+ else if(this.individualList.maritalStatus == 1)
+ this.mrs = '宸插'
+ else
+ this.mrs = '绂诲'// this.isEdit=false
},
- // 琛ㄥ崟閲嶇疆
- reset() {
- if (this.$refs.menu != undefined) {
- this.$refs.menu.setCheckedKeys([]);
- }
- this.menuExpand = false,
- this.menuNodeAll = false,
- this.deptExpand = true,
- this.deptNodeAll = false,
- this.form = {
- roleId: undefined,
- roleName: undefined,
- roleKey: undefined,
- roleSort: 0,
- status: "0",
- menuIds: [],
- deptIds: [],
- menuCheckStrictly: true,
- deptCheckStrictly: true,
- remark: undefined
- };
- this.resetForm("form");
+
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('/self/user/export', {
+ ...this.queryParams
+ }, `self_${new Date().getTime()}.xlsx`)
+ }, //涓汉鍩烘湰淇℃伅
+ submitForm() {
+ if(this.inds=='1')
+ this.individualList.sex = 1;
+ else
+ this.individualList.sex = 0;
+ if(this.mrs=='0')
+ this.individualList.maritalStatus = 0
+ else if(this.mrs == '1')
+ this.individualList.maritalStatus = 1
+ else
+ this.individualList.maritalStatus = 2
+ // alert(10)
+ // 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.individualList.url = ul+","+uls
+ // console.log(this.individualList)
+ this.$refs['elForm'].validate(valid => {
+ if (valid) {
+ if (this.individualList.userId !== undefined) {
+ updateIndividual(this.individualList).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // 寮哄埗鏇存柊鐩稿叧缁勪欢
+ this.individualList={...this.individualList}
+
+ // this.open = false;
+ this.dsb = true
+ this.btn=false
+ this.isShow_2=false
+ this.isShow=true
+ this.isEditing = false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+
+ }
+ }
+ })
+ // 鍒锋柊椤甸潰
+ // window.location.reload();
},
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.dateRange = [];
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
console.log(this.ids)
this.single = selection.length!=1
this.multiple = !selection.length
},
- // //姣忔鏀瑰彉input妗嗗�兼椂灏辨敼鍙榯his.myTableData鐨勫��
- // inputChange() { //寰幆姣忎竴椤� 鍙content鐨勫�煎惈鏈夎緭鍏ョ殑searchVal鍊硷紝灏卞姞杩沶ewList锛涘弽涔嬶紝灏辨棤涓滆タ鍔犺繘newList
- // let newlist = this.formDat.filter(
- // (item) => item.content.indexOf(this.searchVal) > -1
- // );
- // this.contactList = newlist;
- // },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞涓汉璁颁簨鏈缁嗕俊鎭�";
- },
- /** 鏌ョ湅璇︾粏淇℃伅 */
- handleCheck(row){
- const id = row.id;
- this.$router.push("/self/self/memoInfo/" + id);
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- const id = row.id;
- let jd = true
-
- this.$router.push({
- path:"/self/self/memoInfo/" + id,
- query:{
- detail:jd
- }
- });
- },
-
-
- handlePictureCardPreview(file) {
- this.dialogImageUrl = file.url;
- this.dialogVisible = true;
- },
- /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
- submitDataScope: function() {
-
- 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.formDat.url = ul+","+uls
- this.$refs["elForm"].validate(valid => {
- if (valid) {
-
- addNote(this.formDat).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- });
- // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
- this.handleRemove(this.fileList[0]);
- },
- requestUpload(params)
+ requestUpload(params)
{
var file = params.file;
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
+ // console.log(this.individualList)
+ this.$refs.uploadDemo.clearFiles();
+ // alert(234)
uploadPic(formData).then(response => {
+ // alert(response.data.url)
+ // alert(response.data.originalFilename)
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
if(_this.fot.includes(pth) === true)
@@ -625,57 +616,75 @@
}
else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ _this.fileList.push({name:response.data.fileName, url:response.data.url})
}
+ _this.individualList.img = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ _this.individualList.url = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ updateIndividual(_this.individualList).then(response => {
+ // 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
+ // this.formDat.term = selectedOption.value;
+ // this.formDat.id = selectedOption.id;
+ console.log("1")
+ _this.$modal.msgSuccess("淇敼鎴愬姛");
+ _this.dialogVisible.autobiography = false;
+ _this.isEdit1 = false;
+ _this.getList();
+ }).catch(error => {
+ console.log(error);
+ _this.isEdit1 = false;
+ _this.dialogVisible.autobiography = false;
+ });
})
},
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
- return delNote(Ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- const Ids = this.ids;
+ //澶村儚淇敼
+ uploadImage() {
+ const inputElement = document.createElement("input");
+ inputElement.type = "file";
+ inputElement.accept = "image/*";
+ inputElement.style.display = "none";
+ document.body.appendChild(inputElement);
- if(Ids.length==0)
- {
- this.download('/zSelfNote/export', {
- ...this.queryParams
- }, `zSelfNote${new Date().getTime()}.xlsx`)
- }else{
- this.download('/zSelfNote/export1/'+Ids, {
+ inputElement.addEventListener("change", () => {
+ const file = inputElement.files[0];
+ if (file) {
+ const formData = new FormData();
+ formData.append("image", file);
- }, `zSelfNote${new Date().getTime()}.xlsx`)
- }
+ // 璋冪敤uploadPic鎺ュ彛涓婁紶鍥剧墖
+ axios.post("/common/upload", formData, {
+ headers: {
+ "Content-Type": "multipart/form-data"
+ }
+ }).then(response => {
+ // 涓婁紶鎴愬姛锛岃幏鍙栨柊鍥剧墖鐨刄RL
+ const newImageUrl = response.data.img;
+
+ // 鍋囪individualList鏄竴涓璞★紝鏇存柊individualList.img
+ this.individualList.img = newImageUrl;
+
+ // 鍋囪fileList鏄竴涓暟缁勶紝鏇存柊fileList涓搴旂殑鍥剧墖URL
+ // const index = this.fileList.findIndex(item => item.id === fileId);
+ // this.fileList[index].url = newImageUrl;
+
+ // 娓呴櫎input鍏冪礌骞剁Щ闄や簨浠剁洃鍚�
+ document.body.removeChild(inputElement);
+ inputElement.removeEventListener("change", null);
+ }).catch(error => {
+ console.error("涓婁紶澶辫触:", error);
+ // 娓呴櫎input鍏冪礌骞剁Щ闄や簨浠剁洃鍚�
+ document.body.removeChild(inputElement);
+ inputElement.removeEventListener("change", null);
+ });
+ }
+ });
+
+ // 瑙﹀彂鐐瑰嚮浜嬩欢锛屾樉绀烘枃浠堕�夋嫨瀵硅瘽妗�
+ inputElement.click();
},
- handleExportTemplate(){
- this.download('/zSelfNote/model', {
- }, `zSelfNote${new Date().getTime()}.xlsx`)
- },
- /** 瀵煎叆鎿嶄綔*/
- handleEnport(params){
- var file = params.file;
- var formData = new FormData();
- formData.append('excelImport', file);
- let _this = this
-
- enload(formData).then(response => {
- _this.getList();
- Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
-
- }).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
-
- }
}
};
</script>
@@ -691,6 +700,11 @@
background: #FFEFF2;
}
-
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
--
Gitblit v1.9.1