From 4555d41a66b83c8eb61bd99faf473985aeffda1f Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 01 二月 2024 09:11:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- company/src/components/business/OperaSettleClaimsWindow.vue | 388 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 220 insertions(+), 168 deletions(-) diff --git a/company/src/components/business/OperaSettleClaimsWindow.vue b/company/src/components/business/OperaSettleClaimsWindow.vue index aff8aac..dfb5f0a 100644 --- a/company/src/components/business/OperaSettleClaimsWindow.vue +++ b/company/src/components/business/OperaSettleClaimsWindow.vue @@ -12,18 +12,24 @@ <span class="desc_label_left_title"> 鎶ユ璇︽儏 </span> - <span class="desc_label_left_time"> + <span class="desc_label_left_time" :style="contrast(model.createDate, model.baoxianEndTime) ? 'rgba(249, 86, 1, 0.996)' : 'black'"> 鎶ユ鏃ユ湡锛歿{ model.createDate }} </span> <span class="desc_label_left_code"> - 鎶ユ鍙凤細{{ model.reportNum }} + 鎶ユ鍙凤細{{ model.reportNum || '-' }} </span> </div> <div class="desc_label_right"> - <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('娣诲姞鎶ユ鍙�',model,remarkLogList,1)">娣诲姞鎶ユ鍙�</el-button> - <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('鐞嗚禂澶勭悊',model,remarkLogList,2)">鐞嗚禂澶勭悊</el-button> - <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('缁撴鎻愪氦',model,remarkLogList,4)">缁撴鎻愪氦</el-button> - <el-button type="danger" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('鎾ら攢鐢宠',model,remarkLogList,3)">鎾ら攢鐢宠</el-button> + <template v-if="userInfo.type === 0"> + <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('娣诲姞鎶ユ鍙�',model,remarkLogList,1)">娣诲姞鎶ユ鍙�</el-button> + <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('鐞嗚禂澶勭悊',model,remarkLogList,2)">鐞嗚禂澶勭悊</el-button> + <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('缁撴鎻愪氦',model,remarkLogList,4)">缁撴鎻愪氦</el-button> + <el-button type="danger" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('鎾ら攢鐢宠',model,remarkLogList,3)">鎾ら攢鐢宠</el-button> + </template> + <template v-else> + <el-button type="primary" @click="edit" v-if="model.status === 0">淇敼淇℃伅</el-button> + <el-button type="primary" @click="$refs.supplementaryExplanation.open('琛ュ厖璇存槑', model.id)" v-if="model.status === 0">琛ュ厖璇存槑</el-button> + </template> </div> </div> <div class="desc_list"> @@ -47,7 +53,7 @@ <div class="desc_list_item_label"> 浜嬫晠鍙戠敓鏃堕棿锛� </div> - <div class="desc_list_item_val"> + <div class="desc_list_item_val" :style="contrast24(model.createDate, model.baoxianStartTime) ? 'rgba(249, 86, 1, 0.996)' : 'black'"> {{ model.createDate }} </div> </div> @@ -56,7 +62,7 @@ 鎵�灞炰繚鍗曞彿锛� </div> <div class="desc_list_item_val" style="cursor: pointer; color: rgba(39, 157, 255, 0.968627450980392);"> - {{ model.applyCode }} + {{ model.applyCode || '-' }} <el-button v-if="model.baoxiandanFile && model.baoxiandanFile.fileurlFull" type="primary" style="margin-left: 10px;" @click="openBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button> </div> </div> @@ -152,9 +158,10 @@ <div class="desc_list_item_label"> 鎶ユ瑙嗛锛� </div> - <div v-if="model.reportFileList && model.reportFileList.length>0" class="desc_list_item_videos"> - <div class="desc_list_item_imgs_video" v-for="(item, index) in reportFileList" :key="index"> - <video src="${item.fileurlFull}"></video> + <div class="desc_list_item_videos" v-if="model.reportFileList && model.reportFileList.length > 0"> + <div class="desc_list_item_imgs_video" v-for="(item, index) in model.reportFileList" :key="index"> + <img :src="item.fileurlFull" v-if="item.type === 2" /> + <video controls autoplay :src="item.fileurlFull" v-if="item.type === 1"></video> </div> </div> <div v-else class="desc_list_item_videos">-</div> @@ -171,19 +178,24 @@ </span> </div> <div class="desc_label_right"> - <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('澶囨敞鏍囩',model,remarkLogList,5)">澶囨敞鏍囩</el-button> - <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="submit(0)">璧勬枡纭</el-button> + <template v-if="userInfo.type === 0"> + <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="$refs.operaInsuranceApplyCheckWindow.open('澶囨敞鏍囩',model,remarkLogList,5)">澶囨敞鏍囩</el-button> + <el-button type="primary" v-if="model.status !=1 && model.status !=4" @click="submit(0)">璧勬枡纭</el-button> + </template> <el-button type="primary" @click="submit(1)">璧勬枡涓嬭浇</el-button> </div> </div> <div class="desc_data"> <div class="desc_data_label">1. 鍛樺伐鍏崇郴璇佹槑璧勬枡</div> <div class="desc_data_list"> - <template v-if="model.relationFileList && model.relationFileList"> + <template v-if="model.relationFileList && model.relationFileList.length > 0"> <div class="desc_data_list_item" v-for="(item, index) in model.relationFileList" :key="index"> <div class="desc_data_list_item_dele" @click="delFile(item.id)">鍒犻櫎</div> - <div class="desc_data_list_item_img" v-if="item.type ==0 && item.fileurlFull!=null"> + <div class="desc_data_list_item_img" v-if="item.type == 0 && item.fileurlFull != null"> <img :src="item.fileurlFull" /> + </div> + <div class="desc_data_list_item_img" v-if="item.type == 1 && item.fileurlFull != null"> + <video controls :src="item.fileurlFull" /> </div> <div class="desc_data_list_item_info"> <span>{{ item.name }}</span> @@ -192,33 +204,37 @@ </div> </div> </template> - <div class="desc_data_list_item"> - <UploadFileCommon :uploadData="{ folder: 'settle' }" :file="file1" @uploadSuccess="file1Uploaded()" /> - <div class="desc_data_list_item_upload"> - <el-button type="primary">涓婁紶</el-button> - <el-button>鍙栨秷</el-button> - </div> - </div> - <div class="desc_data_list_item1"></div> - <div class="desc_data_list_item1"></div> + <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 2)" /> +<!-- <div class="desc_data_list_item">--> +<!-- <UploadFileCommon :uploadData="{ folder: 'settle' }" />--> +<!-- <div class="desc_data_list_item_upload">--> +<!-- <el-button type="primary">涓婁紶</el-button>--> +<!-- <el-button>鍙栨秷</el-button>--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="desc_data_list_item1"></div>--> +<!-- <div class="desc_data_list_item1"></div>--> </div> </div> <div class="desc_data"> <div class="desc_data_label">2. 鍖荤枟璧勬枡</div> <div class="desc_data_cate"> - <el-tabs v-model="activeName" @tab-click="handleClick"> + <el-tabs v-model="activeName" @tab-click="handleClick"> <el-tab-pane label="闂ㄨ瘖" name="first"></el-tab-pane> <el-tab-pane label="浣忛櫌璧勬枡" name="second"></el-tab-pane> <el-tab-pane label="浼ゆ畫" name="third"></el-tab-pane> </el-tabs> </div> - <div class="desc_data_list" v-if="activeName=='first'"> + <div class="desc_data_list" v-if="activeName === 'first'"> <template v-if="model.outpatientFileList && model.outpatientFileList"> <div class="desc_data_list_item" v-for="(item, index) in model.outpatientFileList" :key="index"> <div class="desc_data_list_item_dele" @click="delFile(item.id)">鍒犻櫎</div> - <div class="desc_data_list_item_img" v-if="item.type ==0 && item.fileurlFull!=null"> - <img :src="item.fileurlFull" /> - </div> + <div class="desc_data_list_item_img" v-if="item.type == 0 && item.fileurlFull != null"> + <img :src="item.fileurlFull" /> + </div> + <div class="desc_data_list_item_img" v-if="item.type == 1 && item.fileurlFull != null"> + <video controls :src="item.fileurlFull" /> + </div> <div class="desc_data_list_item_info"> <span>{{ item.name }}</span> <span>鎿嶄綔鍛�-{{ item.creatorName }}</span> @@ -226,25 +242,29 @@ </div> </div> </template> - <div class="desc_data_list_item"> - <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;"> - <i class="el-icon-plus"></i> - </div> - <div class="desc_data_list_item_upload"> - <el-button type="primary">涓婁紶</el-button> - <el-button>鍙栨秷</el-button> - </div> - </div> - <div class="desc_data_list_item1"></div> - <div class="desc_data_list_item1"></div> + <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 3)" /> +<!-- <div class="desc_data_list_item">--> +<!-- <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">--> +<!-- <i class="el-icon-plus"></i>--> +<!-- </div>--> +<!-- <div class="desc_data_list_item_upload">--> +<!-- <el-button type="primary">涓婁紶</el-button>--> +<!-- <el-button>鍙栨秷</el-button>--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="desc_data_list_item1"></div>--> +<!-- <div class="desc_data_list_item1"></div>--> </div> - <div class="desc_data_list" v-if="activeName=='second'"> - <template v-if="model.outpatientFileList && model.outpatientFileList"> - <div class="desc_data_list_item" v-for="(item, index) in model.outpatientFileList" :key="index"> + <div class="desc_data_list" v-else-if="activeName === 'second'"> + <template v-if="model.hospitalFileList && model.hospitalFileList"> + <div class="desc_data_list_item" v-for="(item, index) in model.hospitalFileList" :key="index"> <div class="desc_data_list_item_dele" @click="delFile(item.id)">鍒犻櫎</div> - <div class="desc_data_list_item_img" v-if="item.type ==0 && item.fileurlFull!=null"> - <img :src="item.fileurlFull" /> - </div> + <div class="desc_data_list_item_img" v-if="item.type == 0 && item.fileurlFull != null"> + <img :src="item.fileurlFull" /> + </div> + <div class="desc_data_list_item_img" v-if="item.type == 1 && item.fileurlFull != null"> + <video controls :src="item.fileurlFull" /> + </div> <div class="desc_data_list_item_info"> <span>{{ item.name }}</span> <span>鎿嶄綔鍛�-{{ item.creatorName }}</span> @@ -252,25 +272,29 @@ </div> </div> </template> - <div class="desc_data_list_item"> - <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;"> - <i class="el-icon-plus"></i> - </div> - <div class="desc_data_list_item_upload"> - <el-button type="primary">涓婁紶</el-button> - <el-button>鍙栨秷</el-button> - </div> - </div> - <div class="desc_data_list_item1"></div> - <div class="desc_data_list_item1"></div> + <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 4)" /> +<!-- <div class="desc_data_list_item">--> +<!-- <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">--> +<!-- <i class="el-icon-plus"></i>--> +<!-- </div>--> +<!-- <div class="desc_data_list_item_upload">--> +<!-- <el-button type="primary">涓婁紶</el-button>--> +<!-- <el-button>鍙栨秷</el-button>--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="desc_data_list_item1"></div>--> +<!-- <div class="desc_data_list_item1"></div>--> </div> - <div class="desc_data_list" v-if="activeName=='third'"> - <template v-if="model.outpatientFileList && model.outpatientFileList"> - <div class="desc_data_list_item" v-for="(item, index) in model.outpatientFileList" :key="index"> + <div class="desc_data_list" v-else-if="activeName === 'third'"> + <template v-if="model.disabilityFileList && model.disabilityFileList"> + <div class="desc_data_list_item" v-for="(item, index) in model.disabilityFileList" :key="index"> <div class="desc_data_list_item_dele" @click="delFile(item.id)">鍒犻櫎</div> - <div class="desc_data_list_item_img" v-if="item.type ==0 && item.fileurlFull!=null"> - <img :src="item.fileurlFull" /> - </div> + <div class="desc_data_list_item_img" v-if="item.type == 0 && item.fileurlFull != null"> + <img :src="item.fileurlFull" /> + </div> + <div class="desc_data_list_item_img" v-if="item.type == 1 && item.fileurlFull != null"> + <video controls :src="item.fileurlFull" /> + </div> <div class="desc_data_list_item_info"> <span>{{ item.name }}</span> <span>鎿嶄綔鍛�-{{ item.creatorName }}</span> @@ -278,18 +302,19 @@ </div> </div> </template> - <div class="desc_data_list_item"> - <UploadFileCommon :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" /> -<!-- <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;"> - <i class="el-icon-plus"></i> - </div>--> - <div class="desc_data_list_item_upload"> - <el-button type="primary">涓婁紶</el-button> - <el-button>鍙栨秷</el-button> - </div> - </div> - <div class="desc_data_list_item1"></div> - <div class="desc_data_list_item1"></div> + <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 5)" /> +<!-- <div class="desc_data_list_item">--> +<!-- <UploadFileCommon :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />--> +<!--<!– <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">--> +<!-- <i class="el-icon-plus"></i>--> +<!-- </div>–>--> +<!-- <div class="desc_data_list_item_upload">--> +<!-- <el-button type="primary">涓婁紶</el-button>--> +<!-- <el-button>鍙栨秷</el-button>--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="desc_data_list_item1"></div>--> +<!-- <div class="desc_data_list_item1"></div>--> </div> </div> <div class="desc_data"> @@ -298,9 +323,12 @@ <template v-if="model.compensationFileList && model.compensationFileList"> <div class="desc_data_list_item" v-for="(item, index) in model.compensationFileList" :key="index"> <div class="desc_data_list_item_dele" @click="delFile(item.id)">鍒犻櫎</div> - <div class="desc_data_list_item_img" v-if="item.type ==0 && item.fileurlFull!=null"> - <img :src="item.fileurlFull" /> - </div> + <div class="desc_data_list_item_img" v-if="item.type == 0 && item.fileurlFull != null"> + <img :src="item.fileurlFull" /> + </div> + <div class="desc_data_list_item_img" v-if="item.type == 1 && item.fileurlFull != null"> + <video controls :src="item.fileurlFull" /> + </div> <div class="desc_data_list_item_info"> <span>{{ item.name }}</span> <span>鎿嶄綔鍛�-{{ item.creatorName }}</span> @@ -308,17 +336,18 @@ </div> </div> </template> - <div class="desc_data_list_item"> - <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;"> - <i class="el-icon-plus"></i> - </div> - <div class="desc_data_list_item_upload"> - <el-button type="primary">涓婁紶</el-button> - <el-button>鍙栨秷</el-button> - </div> - </div> - <div class="desc_data_list_item1"></div> - <div class="desc_data_list_item1"></div> + <upload width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 6)" /> +<!-- <div class="desc_data_list_item">--> +<!-- <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">--> +<!-- <i class="el-icon-plus"></i>--> +<!-- </div>--> +<!-- <div class="desc_data_list_item_upload">--> +<!-- <el-button type="primary">涓婁紶</el-button>--> +<!-- <el-button>鍙栨秷</el-button>--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="desc_data_list_item1"></div>--> +<!-- <div class="desc_data_list_item1"></div>--> </div> </div> <div class="desc_label"> @@ -371,6 +400,10 @@ <el-button @click="visible=false">杩斿洖</el-button> </template> <OperaSettleClaimsCheckWindow ref="operaInsuranceApplyCheckWindow" @success="callback" /> + <!-- 鍦ㄧ嚎鎶ユ --> + <onlineReporting ref="onlineReporting" @success="callback" /> + <!-- 琛ュ厖璇存槑 --> + <supplementaryExplanation ref="supplementaryExplanation" @success="callback" /> </GlobalWindow> </template> @@ -380,32 +413,27 @@ import BaseOpera from '@/components/base/BaseOpera' import GlobalWindow from '@/components/common/GlobalWindow' import OperaSettleClaimsCheckWindow from '@/components/business/OperaSettleClaimsCheckWindow' + import onlineReporting from '@/components/enterprise/onlineReporting' + import supplementaryExplanation from '@/components/enterprise/supplementaryExplanation' + import upload from '@/components/common/upload' import {confirmFile, findById,exportFiles,claimsUploadFile,delFile} from '@/api/business/settleClaims' + import { mapState } from 'vuex' export default { name: 'OperaSettleClaimsWindow', extends: BaseOpera, - components: { GlobalWindow, OperaSettleClaimsCheckWindow,UploadFileCommon }, + components: { GlobalWindow, OperaSettleClaimsCheckWindow,UploadFileCommon, onlineReporting, supplementaryExplanation, upload }, data () { return { - doneFileDate:null, - remarkLogList:[], - // 琛ㄥ崟鏁版嵁 - form: { - id: null, - }, - model:{}, - // 楠岃瘉瑙勫垯 - rules: { - }, - activeName: 'first', - reverse: true, - file1:null, - file2:null, - file3:null, - file4:null, - file5:null, - file6:null + doneFileDate: null, + remarkLogList: [], + list: [], + model: {}, + activeName: 'first', + reverse: true } + }, + computed: { + ...mapState(['userInfo']) }, created () { this.config({ @@ -415,84 +443,95 @@ }, methods: { open(title,target){ - this.model ={} + this.model = {} this.model = target - this.title=title - this.visible=true - this.doneFileDate=null - this.remarkLogList=[] - this. file1=null - this.file2 = null - this.file3 = null - this.file4 = null - this.file5 = null - this.file6 = null + this.title = title + this.visible = true + this.doneFileDate = null + this.remarkLogList = [] this.getDetail() }, + // 鍒ゆ柇涓や釜鏃堕棿涔嬮棿鐩稿樊鏄惁 + contrast24(time1, time2) { + if (time1 && time2) { + let a = new Date(time1) + let b = new Date(time2) + let timeDiff = Math.abs(a.getTime() - b.getTime()); + return Math.ceil(timeDiff / (3600 * 1000)) <= 24; + } else { + return false + } + }, + contrast(time1, time2) { + if (time1 && time2) { + let a = new Date(time1).getTime() + let b = new Date(time2).getTime() + return a > b + } else { + return false + } + }, + edit() { + let obj = JSON.parse(JSON.stringify(this.model)) + obj.areaId = obj.areaId.split(',').map(item => Number(item)) + this.$refs.onlineReporting.open('淇敼淇℃伅', obj) + }, openBaoxiandan(){ window.open(this.model.baoxiandanFile.fileurlFull); }, delFile(id){ this.$dialog.messageConfirm('纭鍒犻櫎璇ラ檮浠跺悧锛屼竴鏃﹀垹闄ゆ棤娉曟挙鍥烇紵') .then(() => { - // this.isWorking = true - delFile(this.model.id,id).then(response => { - that.getDetail() - }).catch(err => { - this.$tip.apiFailed(err) - }) + delFile(this.model.id, id).then(response => { + this.getDetail() + }).catch(err => { + this.$tip.apiFailed(err) + }) }) }, getDetail(){ findById( this.model.id) .then(res => { - this.model = res - this.remarkLogList=[] - var logList = this.model.settleClaimsLogList - if(logList){ - logList.forEach(item => { - if( item.objType==2){ - this.doneFileDate = item.createDate - } - if(item.objType==7){ - this.remarkLogList.push(item) + this.model = res + this.remarkLogList = [] + var logList = this.model.settleClaimsLogList + if (logList) { + logList.forEach(item => { + if (item.objType == 2) { + this.doneFileDate = item.createDate + } + if (item.objType==7) { + this.remarkLogList.push(item) + } + }) } + }).catch(err => { }) - } - }).catch(err => { - }) }, - handleClick(tab, event) { - console.log(tab, event); + handleClick(tab) { + this.activeName = tab.name }, callback(){ this.getDetail() this.$emit('success') }, - claimsUploadFile(type) { - var param = {} - if(type == 2){ - param = this.file2 - }else if(type == 3){ - param = this.file3 - }else if(type == 4){ - param = this.file4 - }else if(type == 5){ - param = this.file5 - }else if(type == 6){ - param = this.file6 - } - claimsUploadFile(param) - .then(response => { - that.getDetail() - }).catch(err => { - this.$tip.apiFailed(err) + claimsUploadFile(e, objType) { + claimsUploadFile({ + id: this.model.id, + objType, + fileUrl: e.imgaddr, + fileName: e.originname, + fileType: e.type + }).then(response => { + this.getDetail() + }).catch(err => { + this.$tip.apiFailed(err) }) - }, + }, submit(type) { - var that =this - if(type ==0){ + var that = this + if (type == 0) { this.$dialog.messageConfirm('鐞嗚禂鏉愭枡鏀堕泦瀹屾垚锛岃鍙婃椂鎻愪氦淇濋櫓鍏徃锛�') .then(() => { // this.isWorking = true @@ -503,7 +542,7 @@ this.$tip.apiFailed(err) }) }) - }else if(type==1){ + }else if(type == 1){ //璧勬枡涓嬭浇 this.$dialog.exportConfirm('纭杩涜璧勬枡涓嬭浇鍚楋紵') .then(() => { @@ -521,10 +560,8 @@ .catch(() => { }) } - } } - } </script> <style> @@ -617,7 +654,8 @@ } .desc_label_left_time { font-size: 14px; - color: rgba(249, 86, 1, 0.996); + color: black; + /*color: rgba(249, 86, 1, 0.996);*/ margin-left: 10px; } .desc_label_left_code { @@ -658,13 +696,20 @@ align-items: center; flex-wrap: wrap; .desc_list_item_imgs_video { - width: 150px; - height: 150px; + width: 120px; + height: 120px; background: black; margin-right: 10px; + display: flex; + align-items: center; + justify-content: center; + overflow: hidden; video { width: 100%; height: 100%; + } + img { + width: 100%; } } } @@ -696,7 +741,6 @@ display: flex; align-items: center; flex-wrap: wrap; - justify-content: space-between; .desc_data_list_item1 { width: 24.5%; } @@ -710,6 +754,10 @@ justify-content: space-between; position: relative; margin-bottom: 10px; + margin-right: 20px; + &:last-child { + margin-right: 0 !important; + } .desc_data_list_item_dele { position: absolute; top: 10px; @@ -733,6 +781,7 @@ align-items: center; justify-content: center; overflow: hidden; + margin-right: 10px; .el-icon-plus { font-size: 26px; color: #ffffff; @@ -741,6 +790,9 @@ width: 100%; height: 100%; } + video { + width: 100%; + } } .desc_data_list_item_info { flex: 1; -- Gitblit v1.9.3