From e20f3d2945acedf83676a0720821e9ec5c8f228e Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期六, 05 八月 2023 17:17:06 +0800
Subject: [PATCH] 个人自传完善新增按钮
---
ruoyi-ui/src/views/collection/index.vue | 194 +++++++++++++++++++++++++++++------------------
1 files changed, 119 insertions(+), 75 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index eaf2fe4..70627ca 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -51,11 +51,16 @@
-->
</el-form-item>
- <el-form-item label="鏃堕棿" style="padding-left:190px">
+ <el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 240px"
- value-format="yyyy-MM-dd HH-MM"
+ 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="寮�濮嬫棩鏈�"
@@ -63,34 +68,23 @@
></el-date-picker>
</el-form-item>
- <el-form-item label="绫诲埆" prop="type" >
- <el-input
+ <el-form-item label="绫诲埆" prop="type">
+ <el-select
v-model="queryParams.type"
- placeholder="璇疯緭鍏ョ被鍒�"
+ placeholder="鎵�鏈夌被鍒�"
clearable
style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+ @keyup.enter.native="handleQuery"
+ >
+ <el-option
+ v-for="item in typeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
</el-form-item>
-<!-- <el-form-item label="绫诲埆" prop="type">-->
-<!-- <el-select-->
-<!-- v-model="queryParams.type"-->
-<!-- placeholder="鎵�鏈夌被鍒�"-->
-<!-- clearable-->
-<!-- style="width: 240px"-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- >-->
-<!-- <el-option-->
-<!-- v-for="dict in typeOptions"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.label"-->
-<!-- :value="dict.value"-->
-
-<!-- />-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
<el-cntainer>
<el-col :span="9" >
<el-form-item>
@@ -125,14 +119,14 @@
</el-form>
<div>
- <div style="width: 100px;
- height: 24px;
- font-size: 18px;
- font-family: Microsoft YaHei-Regular, Microsoft YaHei;
- font-weight: 400;
- color: #000000;
- line-height: 21px;
- ">鏀惰棌鍜岃崳瑾�</div>
+<!-- <div style="width: 100px;-->
+<!-- height: 24px;-->
+<!-- font-size: 18px;-->
+<!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
+<!-- font-weight: 400;-->
+<!-- color: #000000;-->
+<!-- line-height: 21px;-->
+<!-- ">鏀惰棌鍜岃崳瑾�</div>-->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -196,16 +190,14 @@
</div>
<el-table v-loading="loading" :data="collectionList" :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 label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<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-form-item label="绫诲埆" prop="type" width="120">
- <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-table-column label="绫诲埆" prop="type" sortable width="120" align="center">
+ <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>
+<!-- <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>-->
+ </el-table-column>
<el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -213,7 +205,7 @@
<template slot-scope="scope">{{scope.row.source? scope.row.source: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎷ユ湁鑰�" prop="owner" sortable width="110" align="center">
+ <el-table-column label="鎸佹湁鑰�" prop="owner" sortable width="110" align="center">
<template slot-scope="scope">{{scope.row.owner? scope.row.owner: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -226,25 +218,27 @@
<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="鐢靛瓙鏂囦欢" prop="url" width="180" >
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
<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 === ','"
- >
+ <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 label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
@@ -292,12 +286,17 @@
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
<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" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
+<!-- </el-form-item>-->
<el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">
- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>
+ <el-input v-model='formDat.happenTime' type='date' clearable placeholder='閫夋嫨鏃ユ湡'></el-input>
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" >
- </el-input>
+ <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 label="鍚嶇О" prop="name">
<el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" >
@@ -307,8 +306,8 @@
<el-input v-model="formDat.source" placeholder="璇疯緭鍏ユ潵婧�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鎷ユ湁鑰�" prop="owner">
- <el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ嫢鏈夎��" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎸佹湁鑰�" prop="owner">
+ <el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="浠锋牸" prop="price">
@@ -369,7 +368,7 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -479,7 +478,7 @@
type:undefined,
owner:undefined,
location:undefined,
- happenTime:undefined,
+ // happenTime:undefined,
},
// searchVal:"",
@@ -498,8 +497,8 @@
trigger: 'blur'
}],
happenTime: [{
- // required: true,
- message: '璇疯緭鍏ユ椂闂�',
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
trigger: 'blur'
}],
name: [{
@@ -536,20 +535,26 @@
},
typeOptions: [
{
- value: '閫夐」1',
+ value: '閭エ',
label: '閭エ'
}, {
- value: '閫夐」2',
+ value: '鏃ユ湰鍐涘垁',
label: '鏃ユ湰鍐涘垁'
}, {
- value: '閫夐」3',
+ value: '鑼呭彴閰�',
label: '鑼呭彴閰�'
}, {
- value: '閫夐」4',
+ value: '绾㈡湪',
label: '绾㈡湪'
}, {
- value: '閫夐」5',
+ value: '绾康鍝�',
label: '绾康鍝�'
+ }, {
+ value: '鐡峰櫒',
+ label: '鐡峰櫒'
+ }, {
+ value: '涔︾睄',
+ label: '涔︾睄'
}
],
};
@@ -583,6 +588,9 @@
getList() {
this.loading = true;
// console.log(this.queryParams)
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listCollection(this.queryParams).then(response => {
// alert(123)
@@ -605,9 +613,39 @@
})
})
},
-
+ //绫诲埆閫夋嫨
+ getSrc(type) {
+ if (type === '閭エ') {
+ return '閭エ'
+ }else if(type === '鏃ユ湰鍐涘垁'){
+ return '鏃ユ湰鍐涘垁'
+ }else if(type === '鑼呭彴閰�'){
+ return '鑼呭彴閰�'
+ }else if(type === '绾㈡湪'){
+ return '绾㈡湪'
+ }else if(type === '绾康鍝�'){
+ return '绾康鍝�'
+ }else if(type === '鐡峰櫒'){
+ return '鐡峰櫒'
+ }else if(type === '涔︾睄'){
+ return '涔︾睄'
+ } else {
+ return '鍏跺畠'
+ }
+ },
handleRemove(file) {
- alert(323)
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
+ }
+ },
+ handleRemoveFile(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -719,6 +757,12 @@
});
}
});
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ this.handleRemove(this.fileList[0]);
+ this.handleRemoveFile(this.fileListOther[0]);
},
requestUpload(params)
{
--
Gitblit v1.9.1