Skip to content

W
web
Commit 5e88c846 authored by zhang's avatar zhang
Browse files
Options

fix: 解决问题反馈30,32,34,50,64

parent 806c6208
Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 58 deletions
src/components/fileSelect.vue
View file @ 5e88c846
......@@ -60,7 +60,7 @@
<i class="el-icon-success" style="font-size: 20px"> </i>
</div>
</div>
<div class="img-name">文件:{{ childItem.name }}</div>
<div class="img-name">{{ childItem.name }}</div>
<el-button
plain
type="danger"
......@@ -236,15 +236,20 @@ export default {
justify-content: center;
}
.img-name {
display: flex;
font-size: 12px;
width: 70px;
overflow: hidden; /* 隐藏超出容器的内容 */
text-overflow: ellipsis; /* 超出部分显示为省略号 */
white-space: nowrap; /* 文本不换行 */
padding: 5px 0;
width: 180px;
//overflow: hidden; /* 隐藏超出容器的内容 */
//text-overflow: ellipsis; /* 超出部分显示为省略号 */
white-space: pre-line; /* 文本不换行 */
justify-content: center;
//align-items:center
text-align: center;
}
.img-card {
width: 70px;
height: 70px;
height: 90px;
flex: 0 0 50%;
padding-right: 10px;
padding-bottom: 10px;
......
src/views/processing/carReview/write-check-form/components/companyFile.vue
View file @ 5e88c846
......@@ -151,21 +151,21 @@ export default {
fileName: [
{ required: true, message: '请输入文件名称', trigger: 'blur' }
],
version: [
{ required: true, message: '请输入文件版本', trigger: 'blur' }
],
publishDate: [
{ required: true, message: '请选择发布日期', trigger: 'change' }
],
status: [
{ required: true, message: '请选择文件状态', trigger: 'change' }
],
storage: [
{ required: true, message: '请输入存储位置', trigger: 'blur' }
],
identifyNumber: [
{ required: true, message: '请输入文件识别号', trigger: 'blur' }
]
// version: [
// { required: true, message: '请输入文件版本', trigger: 'blur' }
// ],
// publishDate: [
// { required: true, message: '请选择发布日期', trigger: 'change' }
// ],
// status: [
// { required: true, message: '请选择文件状态', trigger: 'change' }
// ],
// storage: [
// { required: true, message: '请输入存储位置', trigger: 'blur' }
// ],
// identifyNumber: [
// { required: true, message: '请输入文件识别号', trigger: 'blur' }
// ]
},
dialogManger: {
dialogVisible: false,
......
src/views/processing/carReview/write-check-form/components/previewView.vue
View file @ 5e88c846
......@@ -42,7 +42,7 @@
<collapse-item
v-for="(item, key) in dialogManger.model.carReviewTask.standard"
:key="key"
:name="item.chapter"
:name="item.chapter + key"
>
<span slot="title" style="width: 100%">
<div class="standard-box">
......@@ -179,8 +179,8 @@ export default {
},
openAll() {
this.activeNames = this.dialogManger.model.carReviewTask.standard.map(
i => {
return i.chapter
(i,key) => {
return i.chapter + key
}
)
},
......
src/views/processing/carReview/write-check-form/index.vue
View file @ 5e88c846
......@@ -230,8 +230,8 @@
prop="passed"
>
<el-radio-group v-model="form.passed">
<el-radio :label="1">符合</el-radio>
<el-radio :label="0">不符合</el-radio>
<el-radio :label="1" @click.native="onRadioChange($event,'1')">符合</el-radio>
<el-radio :label="0" @click.native="onRadioChange($event,'0')">不符合</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="right-content-item" label="相关记录">
......@@ -528,6 +528,15 @@ export default {
this.handleCircle(0)
},
methods: {
onRadioChange(e,passed) {
if(e.target.tagName == 'INPUT'){
if (passed == this.form.passed) {
this.form.passed = null;
}else{
this.form.passed = passed;
}
}
},
/**
* 企业文件保存回调
*/
......
src/views/processing/checkFileLibrary/components/materialDialog.vue 0 → 100644
View file @ 5e88c846
<template>
<el-dialog
:visible.sync="dialogManger.dialogVisible"
title="查看素材"
width="1200"
append-to-body
destroy-on-close
:close-on-click-modal="false"
:before-close="handleClose"
>
<el-table
:data="dialogManger.documentInfo"
border
stripe>
<el-table-column
type="index"
label="序号"
width="100">
</el-table-column>
<el-table-column
prop="photo"
label="素材名称(点击预览)"
>
<template slot-scope="scope">
<el-button type="text" @click="jumpLookUp(scope.row.photo)">{{ scope.row.photo }}</el-button>
</template>
</el-table-column>
</el-table>
<div slot="footer">
<el-button @click="handleClose()">确定</el-button>
</div>
</el-dialog>
</template>
<script>
import fileSelect from '@/components/fileSelect.vue'
export default {
components: {
fileSelect
},
props: {
dialogManger: {
type: Object,
default() {
return {
dialogVisible: false,
dialogEditId: 0,
documentInfo: []
}
}
}
},
created(){
console.log(this.dialogManger)
},
data() {
return {
}
},
watch: {
'dialogManger.dialogEditId'(newValue) {
this.model.fetch(
newValue,
{},
() => {
this.dialogManger.dialogVisible = true
},
() => {
this.$emit('refresh')
}
)
}
},
methods: {
selectFile(e) {
this.model.url = e
},
jumpLookUp(url){
window.open(url)
},
isImageFile(filename) {
/**
* 判断文件名是否对应于常见的图片格式。
*
* 参数:
* filename (string): 需要检查的文件名。
*
* 返回:
* boolean: 如果文件名对应的扩展名是图片格式，则返回true，否则返回false。
*/
// 常见图片格式列表
const imageExtensions = ['jpg', 'jpeg', 'png']
// 获取文件扩展名（不包括点）
const extension = filename
.slice(((filename.lastIndexOf('.') - 1) >>> 0) + 2)
.toLowerCase()
// 检查文件扩展名是否在图片格式列表中
return imageExtensions.includes(extension)
},
handleClose() {
this.$emit('close')
},
selectSampleMaterial() {
this.fileManger.dialogVisible = true
},
handleConfirm() {
this.$refs['fileRef'].validate(valid => {
if (valid) {
this.model.save(
() => {
this.dialogManger.dialogVisible = false
this.$emit('refresh')
},
errors => {}
)
}
})
}
}
}
</script>
src/views/processing/checkFileLibrary/index.vue
View file @ 5e88c846
......@@ -138,6 +138,17 @@
align="left"
>
</el-table-column>
<el-table-column
prop=""
label="素材"
min-width="100"
show-overflow-tooltip
align="left"
>
<template slot-scope="scope">
<el-button type="text" @click="showMaterial(scope.row)"> 素材文件 </el-button>
</template>
</el-table-column>
<el-table-column
prop="createBy"
label="创建人员"
......@@ -163,6 +174,11 @@
@refresh="refreshList = true"
@close="dialogManger.dialogVisible = false"
></yan-dialog>
<material-dialog
:dialog-manger="mDialogManger"
@refresh="refreshList = true"
@close="mDialogManger.dialogVisible = false"
></material-dialog>
<pagination
:total="total"
:background="false"
......@@ -177,10 +193,12 @@
<script>
import page from '@/mixins/page'
import dialog from './components/dialog.vue'
import materialDialog from './components/materialDialog.vue';
import routerMixins from '@/mixins/router'
export default {
components: {
'yan-dialog': dialog
'yan-dialog': dialog,
'material-dialog' : materialDialog
},
dicts: ['file_status'],
mixins: [page, routerMixins],
......@@ -192,6 +210,11 @@ export default {
refreshList: false,
dialogEditId: 0
},
mDialogManger: {
dialogVisible: false,
refreshList: false,
documentInfo: []
},
queryParams: {
pageNum: 1,
pageSize: 10,
......@@ -220,6 +243,19 @@ export default {
this.queryParams.taskId = this.$route.query.id
},
methods: {
showMaterial(data){
let documents = []
if(data.photo){
let photos = data.photo.split(',')
for(let i=0;i<photos.length;i++){
data.photo = photos[i]
documents.push(data)
}
}
this.mDialogManger.documentInfo = documents
this.mDialogManger.dialogVisible = true
},
sort_change(column, prop, order) {
this.queryParams.pageNum = 1 // 排序后返回第一页
if (column.order) {
......
src/views/processing/systemReview/source-record/index.vue
View file @ 5e88c846
......@@ -384,16 +384,6 @@ export default {
await this.getTask()
this.openAll()
},
filters: {
// 过滤器:当字符串超过64位时,之后的字符用...代替
ellipsis(value) {
if (!value) return ''
if (value.length > 12) {
return value.slice(0, 12) + '\n' + value.slice(12)
}
return value
}
},
methods: {
/**
* 获取子任务详情
......
src/views/processing/systemReview/write-check-form/components/companyFile.vue
View file @ 5e88c846
......@@ -151,21 +151,21 @@ export default {
fileName: [
{ required: true, message: '请输入文件名称', trigger: 'blur' }
],
version: [
{ required: true, message: '请输入文件版本', trigger: 'blur' }
],
publishDate: [
{ required: true, message: '请选择发布日期', trigger: 'change' }
],
status: [
{ required: true, message: '请选择文件状态', trigger: 'change' }
],
storage: [
{ required: true, message: '请输入存储位置', trigger: 'blur' }
],
identifyNumber: [
{ required: true, message: '请输入文件识别号', trigger: 'blur' }
]
// version: [
// { required: true, message: '请输入文件版本', trigger: 'blur' }
// ],
// publishDate: [
// { required: true, message: '请选择发布日期', trigger: 'change' }
// ],
// status: [
// { required: true, message: '请选择文件状态', trigger: 'change' }
// ],
// storage: [
// { required: true, message: '请输入存储位置', trigger: 'blur' }
// ],
// identifyNumber: [
// { required: true, message: '请输入文件识别号', trigger: 'blur' }
// ]
},
dialogManger: {
dialogVisible: false,
......
src/views/processing/systemReview/write-check-form/components/previewView.vue
View file @ 5e88c846
......@@ -42,7 +42,7 @@
<collapse-item
v-for="(item, key) in dialogManger.model.systemReviewTask.standard"
:key="key"
:name="item.chapter"
:name="item.chapter + key"
>
<span slot="title" style="width: 100%">
<div class="standard-box">
......@@ -179,8 +179,8 @@ export default {
},
openAll() {
this.activeNames = this.dialogManger.model.systemReviewTask.standard.map(
i => {
return i.chapter
(i,key) => {
return i.chapter + key
}
)
},
......
src/views/processing/systemReview/write-check-form/index.vue
View file @ 5e88c846
......@@ -241,8 +241,8 @@
prop="passed"
>
<el-radio-group v-model="form.passed">
<el-radio :label="1">符合</el-radio>
<el-radio :label="0">不符合</el-radio>
<el-radio :label="1" @click.native="onRadioChange($event,'1')">符合</el-radio>
<el-radio :label="0" @click.native="onRadioChange($event,'0')">不符合</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="right-content-item" label="相关记录">
......@@ -468,7 +468,8 @@ export default {
id: 0
}
}),
loading: false
loading: false,
choosed:''
}
},
......@@ -549,6 +550,15 @@ export default {
this.handleCircle(0)
},
methods: {
onRadioChange(e,passed) {
if(e.target.tagName == 'INPUT'){
if (passed == this.form.passed) {
this.form.passed = null;
}else{
this.form.passed = passed;
}
}
},
/**
* 企业文件保存回调
*/
......@@ -725,6 +735,7 @@ export default {
* @param item 圆圈对象
*/
changeStep(index) {
console.log(this.isAllPropertiesEqual())
if (
this.isAllPropertiesEqual() &&
!this.allPropertiesCheck(this.form.fileList, 'isFileUpdate')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment