zhangshi_app_web.git

			@@ -139,7 +139,7 @@
			</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 type="selection" :reserve-selection="true" width="55" 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" >
			@@ -222,8 +222,9 @@
			<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-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
			:editable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
			></el-date-picker></el-form-item>
			<el-form-item label="人物" prop="people">
			<el-input v-model="formDat.people" placeholder="请输入人物" clearable :style="{width: '100%'}" >
			</el-input>
			@@ -241,7 +242,7 @@
			<el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
			</el-form-item>

			<h4 class="form-header">电子文件 </h4>
			<h4 class="form-header">相关图片 </h4>
			<el-upload
			action="#"
			list-type="picture-card"
			@@ -291,6 +292,7 @@
			:show-file-list="true"
			>
			<el-button type="primary">点击上传</el-button>
			<div v-if="uploading" class="upload-status">正在上传...</div>
			<template #tip>
			<div class="el-upload__tip">
			</div>
			@@ -365,6 +367,7 @@
			],
			dsb:true,
			btn:false,
			uploading: false,
			fit:['fill'],
			keyword:'',
			formDat: {
			@@ -614,10 +617,11 @@
			var formData = new FormData();
			formData.append('uploadFile', file);
			let _this = this

			this.uploading = true;
			uploadPic(formData).then(response => {
			let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

			this.uploading = false;
			this.$modal.msgSuccess("上传成功");
			if(_this.fot.includes(pth) === true)
			{
			_this.fileList.push({name:response.data.fileName, "url":response.data.url})