From edf97cb2bfe110123a6dacc1cd8c52ce400ff1db Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期三, 19 七月 2023 00:46:03 +0800 Subject: [PATCH] 新增个人记事本展示和详情页 --- ruoyi-ui/src/views/note/index.vue | 250 +++++++++++++++++++++++++------------------------ 1 files changed, 127 insertions(+), 123 deletions(-) diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue index 98aa493..904183d 100644 --- a/ruoyi-ui/src/views/note/index.vue +++ b/ruoyi-ui/src/views/note/index.vue @@ -2,56 +2,52 @@ <div class="app-container"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="绫诲瀷" prop="type"> - <el-select + <el-input v-model="queryParams.type" - placeholder="鎵�鏈夌被鍨�" + placeholder="璇疯緭鍏ョ被鍨�" clearable style="width: 240px" - > - <el-option - v-for="dict in typeOptions" - :key="dict.value" - :label="dict.label" - :value="dict.value" - /> - </el-select> - <el-form-item label="鏍囬" prop="title"> - <el-input - v-model="queryParams.title" - placeholder="璇疯緭鍏ユ爣棰�" - clearable - style="width: 240px" - @keyup.enter.native="handleQuery" - /> - </el-form-item> - <el-form-item label="瀛樺偍鍦板潃" prop="location"> - <el-input - v-model="queryParams.location" - placeholder="璇疯緭鍏ュ瓨鍌ㄥ湴鍧�" - clearable - style="width: 240px" - @keyup.enter.native="handleQuery" - /> - </el-form-item> - <el-form-item label="鎸佹湁浜�" prop="holder"> - <el-input - v-model="queryParams.holder" - placeholder="璇疯緭鍏ユ寔鏈変汉" - clearable - style="width: 240px" - @keyup.enter.native="handleQuery" - /> - </el-form-item> - <el-form-item label="鍏蜂綋浣嶇疆" prop="address"> - <el-input - v-model="queryParams.address" - placeholder="璇疯緭鍏ュ叿浣撲綅缃�" - clearable - style="width: 240px" - @keyup.enter.native="handleQuery" - /> - </el-form-item> + @keyup.enter.native="handleQuery" + /> </el-form-item> + + <el-form-item label="鏍囬" prop="title"> + <el-input + v-model="queryParams.title" + placeholder="璇疯緭鍏ユ爣棰�" + clearable + style="width: 240px" + @keyup.enter.native="handleQuery" + /> + </el-form-item> + <el-form-item label="瀛樺偍鍦板潃" prop="location"> + <el-input + v-model="queryParams.location" + placeholder="璇疯緭鍏ュ瓨鍌ㄥ湴鍧�" + clearable + style="width: 240px" + @keyup.enter.native="handleQuery" + /> + </el-form-item> + <el-form-item label="鎸佹湁浜�" prop="holder"> + <el-input + v-model="queryParams.holder" + placeholder="璇疯緭鍏ユ寔鏈変汉" + clearable + style="width: 240px" + @keyup.enter.native="handleQuery" + /> + </el-form-item> + <el-form-item label="鍏蜂綋浣嶇疆" prop="address"> + <el-input + v-model="queryParams.address" + placeholder="璇疯緭鍏ュ叿浣撲綅缃�" + clearable + style="width: 240px" + @keyup.enter.native="handleQuery" + /> + </el-form-item> + <!-- </el-form-item> --> <el-form-item label="鍙戠敓鏃堕棿"> <el-date-picker v-model="dateRange" @@ -103,31 +99,31 @@ @click="handleExport" v-hasPermi="['family:note:export']" >瀵煎嚭</el-button> - </el-col> + </el-col> - <el-col :span="1.5"> - <el-button - type="warning" - plain - icon="el-icon-download" - size="mini" - @click="handleExport" - 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-col :span="1.5"> + <el-button + type="warning" + plain + icon="el-icon-download" + size="mini" + @click="handleExport" + 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> + </el-upload> + </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> @@ -142,34 +138,33 @@ <el-table-column label="瀛樺偍鍦板潃" prop="location" sortable width="100" /> <el-table-column label="鎸佹湁浜�" prop="holder" sortable width="100" /> <el-table-column label="鍏蜂綋浣嶇疆" prop="address" sortable width="100" /> - <el-table-column label="澶囨敞淇℃伅" prop="remark" sortable width="100" /> - <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" /> - <el-table-column label="鍙戠敓鏃堕棿" align="center" sortable prop="happenTime" width="180"> - - <template slot-scope="scope"> - <span>{{ parseTime(scope.row.happenTime) }}</span> - </template> + <el-table-column label="澶囨敞" prop="remark" sortable width="100" > + <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template> + </el-table-column> + <!-- <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" /> --> + <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="100" align="center"> + <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template> </el-table-column> <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" > - <template slot-scope="scope" > - <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 !== null" - > - <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 === null" - > - </template> - </el-table-column> + <template slot-scope="scope" > + <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 === ','" + > + </template> + </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 @@ -206,13 +201,15 @@ <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 --> <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="type"> + <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" ></el-input> + </el-form-item> + <!-- <el-form-item label="绫诲埆" prop="type"> <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" > <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value" ></el-option> </el-select> - </el-form-item> + </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> @@ -228,11 +225,13 @@ <el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ叿浣撲綅缃�" clearable :style="{width: '100%'}" > </el-input> </el-form-item> - <el-form-item label="瀹跺涵鍙�" prop="familyId"> - <el-input v-model="formDat.familyId" placeholder="璇疯緭鍏ュ搴彿" clearable :style="{width: '100%'}" > - </el-input> + <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime"> + <el-date-picker + v-model='formDat.happenTime' + type='date' + placeholder='閫夋嫨鏃ユ湡' + ></el-date-picker> </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> @@ -286,7 +285,7 @@ :http-request="requestUpload" :show-file-list="true" > - <el-button type="primary">Click to upload</el-button> + <el-button type="primary">鐐瑰嚮涓婁紶</el-button> <template #tip> <div class="el-upload__tip"> </div> @@ -368,6 +367,7 @@ holder: undefined, address: undefined, remark: undefined, + happenTime:undefined, url: undefined, }, @@ -397,8 +397,8 @@ rules: { type: [{ required: true, - message: '璇烽�夋嫨绫诲埆', - trigger: 'change' + message: '璇疯緭鍏ョ被鍨�', + trigger: 'blur' }], title: [{ required: true, @@ -420,12 +420,8 @@ message: '璇疯緭鍏ュ叿浣撲綅缃�', trigger: 'blur' }], - familyId: [{ - required: true, - message: '璇疯緭鍏amilyId', - trigger: 'blur' - }], - createTime: [{ + + happenTime: [{ required: true, message: '璇烽�夋嫨鏃ユ湡閫夋嫨', trigger: 'change' @@ -486,7 +482,11 @@ }, handleRemove(file) { - alert(323) + for(let i = 0; i < this.fileListOther.length; i++) + { + if(this.fileListOther[i].url==file.url) + this.$delete(this.fileListOther,i); + } }, // 鍙栨秷鎸夐挳 cancel() { @@ -589,6 +589,10 @@ }); } }); + // 娓呯┖formDat瀵硅薄鐨勬暟鎹� + Object.keys(this.formDat).forEach(key => { + this.formDat[key] = ''; + }); }, requestUpload(params) { @@ -631,19 +635,19 @@ }, /** 瀵煎叆鎿嶄綔*/ handleEnport(params){ - var file = params.file; - var formData = new FormData(); - formData.append('excelImport', file); - let _this = this - alert(file) - enload(formData).then(response => { - _this.getList(); - Message({ message: "瀵煎叆鎴愬姛", type: 'warning' }) + var file = params.file; + var formData = new FormData(); + formData.append('excelImport', file); + let _this = this + alert(file) + enload(formData).then(response => { + _this.getList(); + Message({ message: "瀵煎叆鎴愬姛", type: 'warning' }) - }).catch(err) - { - Message({ message: "瀵煎叆澶辫触", type: 'error' }) - } + }).catch(err) + { + Message({ message: "瀵煎叆澶辫触", type: 'error' }) + } } } -- Gitblit v1.9.1