From 99676ee4afd8aa9ca0caedb07b5754831a746465 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 23 十一月 2024 17:42:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/contract/components/contractEdit.vue | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/contract/components/contractEdit.vue b/admin/src/views/contract/components/contractEdit.vue
index 8e79bce..13e6378 100644
--- a/admin/src/views/contract/components/contractEdit.vue
+++ b/admin/src/views/contract/components/contractEdit.vue
@@ -1,5 +1,6 @@
<template>
- <GlobalWindow width="1000px" :title="title" :visible.sync="showModal" :confirm-working="isWorking" @close="close" @confirm="confirm">
+ <GlobalWindow width="1000px" :title="title" :visible.sync="showModal" :confirm-working="isWorking" @close="close"
+ @confirm="confirm">
<div class="tabs">
<div class="tab" :class="{ active: activeTabs == 0 }" @click="tabsClick(0)">1銆佸熀鏈俊鎭�</div>
<div class="tab" :class="{ active: activeTabs == 1 }" @click="tabsClick(1)">2銆佽垂鐢ㄦ潯娆�</div>
@@ -74,7 +75,10 @@
<div class="file_wrap">
<div class="head">
<div>鍚堝悓闄勪欢</div>
- <el-button icon="el-icon-plus" plain>娣诲姞闄勪欢</el-button>
+ <el-upload class="upload-demo" :show-file-list="false" :data="uploadData" :action="uploadImgUrl"
+ :on-success="uploadAvatarSuccess" :before-upload="beforeUpload" :on-error="uploadError">
+ <el-button icon="el-icon-plus" plain>娣诲姞闄勪欢</el-button>
+ </el-upload>
</div>
<el-table :data="param.list" stripe>
<el-table-column prop="" label="闄勪欢鍚嶇О" align="center" min-width="100" show-overflow-tooltip />
@@ -133,7 +137,7 @@
<el-button style="width: 100%;height: 48px;" type="primary" plain>鐢熸垚璐﹀崟鏄庣粏</el-button>
<el-table :data="paramCost.list" class="mt20" stripe>
<el-table-column prop="" label="璐圭敤绫诲瀷" align="center" width="160px" show-overflow-tooltip />
- <el-table-column prop="" label="鎸囨暟"align="center" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="" label="鎸囨暟" align="center" min-width="100" show-overflow-tooltip />
<el-table-column prop="" label="鍖洪棿" align="center" min-width="100" show-overflow-tooltip />
<el-table-column prop="" label="浠樻鏃�" align="center" min-width="100" show-overflow-tooltip />
<el-table-column prop="" label="搴旀敹" align="center" min-width="100" show-overflow-tooltip />
@@ -153,6 +157,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import MemberSearch from '@/components/common/MemberSearch'
import { rules } from './config'
+import { Message, Loading } from 'element-ui'
export default {
components: {
GlobalWindow,
@@ -166,6 +171,13 @@
activeTabs: '0',
param: {},
rules,
+
+ loadingInstance: null,
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadBatch',
+ fileList: [],
+ uploadData: {
+ folder: 'HIDDEN_DANGER_FILE'
+ },
types: [
{ name: '鐗╀笟+绉熻祦鍚堝悓', value: 0 },
@@ -265,6 +277,50 @@
console.log(this.value)
},
+ beforeUpload(file) {
+ // if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb', 'image/jpeg', 'image/jpg', 'image/png', 'image/gif'].indexOf(file.type) == -1) {
+ // this.$message.error('璇蜂笂浼犳纭殑瑙嗛/鍥剧墖鏍煎紡')
+ // return false
+ // }
+ this.loadingInstance = Loading.service({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ },
+ uploadError() {
+ this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+ if (this.loadingInstance) {
+ this.loadingInstance.close()
+ }
+ })
+ },
+ uploadAvatarSuccess(file) {
+ this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+ if (this.loadingInstance) {
+ this.loadingInstance.close()
+ }
+ })
+ console.log('file', file)
+ const item = file.data[0]
+ if (['.mp4', '.avi', '.flv', '.wmv'].some(char => item.imgaddr.includes(char))) {
+ this.fileList.push({
+ type: 1,
+ fileurl: item.imgaddr,
+ fileurlFull: item.url
+ })
+ } else {
+ this.fileList.push({
+ type: 0,
+ fileurl: item.imgaddr,
+ fileurlFull: item.url
+ })
+ }
+ console.log('file', this.fileList)
+ // this.$set(this.param, 'faceImg', file.imgurl)
+ // this.$set(this.param, 'faceImgUrl', file.imgurlfull)
+ },
close() {
this.showModal = false
this.$emit('close')
@@ -331,7 +387,7 @@
}
.main_house {
- width: 420px;
+ width: 320px;
padding: 24px 12px;
border: 1px solid #c3c6cd;
border-radius: 2px;
@@ -344,17 +400,20 @@
}
}
-.total{
+
+.total {
display: flex;
justify-content: space-between;
align-items: center;
height: 32px;
background-color: #e7e9f5;
- span{
+
+ span {
width: 160px;
text-align: center;
}
}
+
.file_wrap {
padding: 20px 16px;
border: 1px solid #c3c6cd;
--
Gitblit v1.9.3