Skip to content

W
web
Commit 7a593546 authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

Merge branch 'develop' into developer/yanjiaxu

parents efb4905f 3790ff6a
Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 72 deletions
src/views/processing/processed-review/index.vue
View file @ 7a593546
...@@ -158,7 +158,8 @@ export default { ...@@ -158,7 +158,8 @@ export default {
justify-content: space-around; justify-content: space-around;
} }
.box-card { .box-card {
margin-bottom: 31px; margin-bottom: 15px;
font-size: 14px;
::v-deep .el-card__body { ::v-deep .el-card__body {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -175,6 +176,14 @@ export default { ...@@ -175,6 +176,14 @@ export default {
.cell-progress { .cell-progress {
width: 200px; width: 200px;
} }
.cell-lable {
color: #515a6e;
font-size: 13px;
}
.cell-value {
font-size: 14px;
color: #606266;
}
.cell-value.green { .cell-value.green {
color: #19be6b; color: #19be6b;
} }
......
src/views/processing/unprocessed-review/index.vue
View file @ 7a593546
...@@ -276,7 +276,8 @@ export default { ...@@ -276,7 +276,8 @@ export default {
justify-content: space-around; justify-content: space-around;
} }
.box-card { .box-card {
margin-bottom: 31px; margin-bottom: 15px;
font-size: 14px;
::v-deep .el-card__body { ::v-deep .el-card__body {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -293,6 +294,14 @@ export default { ...@@ -293,6 +294,14 @@ export default {
.cell-progress { .cell-progress {
width: 200px; width: 200px;
} }
.cell-lable {
color: #515a6e;
font-size: 13px;
}
.cell-value {
font-size: 14px;
color: #606266;
}
.cell-value.yellow { .cell-value.yellow {
color: #fea623; color: #fea623;
} }
......
src/views/review/view/index.vue
View file @ 7a593546
<template> <template>
<page-standard> <el-card>
<div slot="header" class="clearfix">
<span>查看评审</span>
<el-button
size="mini"
icon="el-icon-back"
class="back-btn"
type="text"
@click="handleBack"
>
返回
</el-button>
<span class="card-top-text"
>参与评案人员: 张学良(组长)、于风至、赵一荻</span
>
</div>
<div class="subtitle">评审对象</div> <div class="subtitle">评审对象</div>
<el-row :gutter="20" justify="center" type="flex"> <el-row :gutter="20" justify="center" type="flex">
<el-col :span="20"> <el-col :span="20">
...@@ -35,34 +50,34 @@ ...@@ -35,34 +50,34 @@
<message-item></message-item> <message-item></message-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="subtitle">讨论区</div> <!-- <div class="subtitle">讨论区</div>-->
<el-row :gutter="20" class="mt10" justify="center" type="flex"> <!-- <el-row :gutter="20" class="mt10" justify="center" type="flex">-->
<el-col :span="22"> <!-- <el-col :span="22">-->
<div class="message-box mt5"> <!-- <div class="message-box mt5">-->
<el-avatar :size="60" class="mr10" :src="circleUrl"></el-avatar> <!-- <el-avatar :size="60" class="mr10" :src="circleUrl"></el-avatar>-->
<div style="width: 100%"> <!-- <div style="width: 100%">-->
<el-input <!-- <el-input-->
v-model="model.deptName" <!-- v-model="model.deptName"-->
placeholder="输入评论内容" <!-- placeholder="输入评论内容"-->
clearable <!-- clearable-->
type="textarea" <!-- type="textarea"-->
:autosize="false" <!-- :autosize="false"-->
show-word-limit <!-- show-word-limit-->
:maxlength="100" <!-- :maxlength="100"-->
:rows="5" <!-- :rows="5"-->
/> <!-- />-->
<el-button size="mini" class="mt5" type="primary" plain <!-- <el-button size="mini" class="mt5" type="primary" plain-->
>发布评论</el-button <!-- >发布评论</el-button-->
> <!-- >-->
<div class="subtitle mt10">全部评论5条</div> <!-- <div class="subtitle mt10">全部评论5条</div>-->
<talk-item> </talk-item> <!-- <talk-item> </talk-item>-->
<talk-item :has-child="true"> </talk-item> <!-- <talk-item :hasChild="true"> </talk-item>-->
<talk-item> </talk-item> <!-- <talk-item> </talk-item>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</page-standard> </el-card>
</template> </template>
<script> <script>
import page from '@/mixins/page' import page from '@/mixins/page'
...@@ -80,25 +95,23 @@ export default { ...@@ -80,25 +95,23 @@ export default {
'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png' 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
} }
}, },
watch: {
'dialogManger.refreshList': function (val) {
if (val) {
this.loadData()
this.dialogManger.refreshList = false
}
}
},
methods: { methods: {
handleAdd() { handleBack() {
this.dialogManger.dialogVisible = true this.$router.back()
this.dialogManger.source = {}
},
handleDelete() {},
handleUpdate(row) {
this.dialogManger.dialogVisible = true
this.dialogManger.source = row
} }
// handleAdd() {
// this.dialogManger.dialogVisible = true
// this.dialogManger.source = {}
// }
} }
// watch: {
// 'dialogManger.refreshList': function (val) {
// if (val) {
// this.loadData()
// this.dialogManger.refreshList = false
// }
// }
// }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
...@@ -108,4 +121,13 @@ export default { ...@@ -108,4 +121,13 @@ export default {
align-items: flex-start; align-items: flex-start;
font-size: 12px; font-size: 12px;
} }
.back-btn {
float: right;
margin-right: 10px;
}
.card-top-text {
float: right;
margin-right: 50px;
font-size: 16px;
}
</style> </style>
src/views/task/confirm-result/index.vue
View file @ 7a593546
...@@ -185,13 +185,14 @@ ...@@ -185,13 +185,14 @@
</el-form> </el-form>
</div> </div>
<!--返回按钮--> <!--返回按钮-->
<el-button <div class="bottom-btn">
class="btn" <el-button type="warning" @click="goToProcessedReview">
type="primary" 返回
plain </el-button>
@click="goToProcessedReview" <el-button type="primary" @click="goToProcessedReview">
>返 回 确认提交
</el-button> </el-button>
</div>
</div> </div>
</div> </div>
</page-standard> </page-standard>
...@@ -828,4 +829,8 @@ td { ...@@ -828,4 +829,8 @@ td {
width: 300px; width: 300px;
height: 100%; height: 100%;
} }
.bottom-btn {
display: flex;
justify-content: center;
}
</style> </style>
src/views/task/new/index.vue
View file @ 7a593546
...@@ -439,12 +439,26 @@ export default { ...@@ -439,12 +439,26 @@ export default {
* 小组信息修改 * 小组信息修改
* @param row 行内信息 * @param row 行内信息
*/ */
handleUpdate(row) {}, handleUpdate(row) {
row.name = ''
},
/** /**
* 小组信息删除 * 小组信息删除
* @param row 行内信息 * @param row 行内信息
*/ */
handleDelete(row) {}, handleDelete(row) {
this.$confirm('是否确认删除此条数据,删除后不可恢复', '删除', {
confirmButtonText: '确定',
concelButtonText: '取消',
type: 'warning',
customClass: 'box-logout',
cancelButtonClass: 'resetBtn',
closeOnClickModal: false,
confirmButtonClass: 'queryBtn'
}).then(() => {
this.tableData = this.tableData.filter(item => item.name !== row.name)
})
},
/** /**
* 保存人员 * 保存人员
* @param row * @param row
......
src/views/task/questionnaire/index.vue
View file @ 7a593546
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="main-content"> <div class="main-content">
<div class="prompt-message"> <div class="prompt-message">
<span>问卷填写情况：共10条审查细则，已完成1条，未完成9条</span> <span>问卷填写情况：共10条审查细则，已完成1条，未完成9条</span>
<span class="center-text">有 3 条场景变更待处理</span> <!-- <span class="center-text">有 3 条场景变更待处理</span>-->
<el-checkbox v-model="checked">仅显示未完成条目</el-checkbox> <el-checkbox v-model="checked">仅显示未完成条目</el-checkbox>
</div> </div>
<el-row> <el-row>
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
> >
</el-form-item> </el-form-item>
<el-form-item label="符合场景"> <el-form-item label="符合场景">
<el-button type="warning" @click="handleAddScene">
新增场景
</el-button>
<div class="match-scene"> <div class="match-scene">
<el-checkbox v-model="checked"> <el-checkbox v-model="checked">
1.管理制度发布会红头文件 1.管理制度发布会红头文件
...@@ -114,10 +117,11 @@ ...@@ -114,10 +117,11 @@
:model="fileData" :model="fileData"
label-width="100px" label-width="100px"
class="file-form-class" class="file-form-class"
:rules="fileRules"
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="企业名称"> <el-form-item label="企业名称" prop="enterpriseName">
<el-input <el-input
v-model="fileData.enterpriseName" v-model="fileData.enterpriseName"
placeholder="请输入" placeholder="请输入"
...@@ -125,7 +129,7 @@ ...@@ -125,7 +129,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="文件名称"> <el-form-item label="文件名称" prop="fileName">
<el-input <el-input
v-model="fileData.fileName" v-model="fileData.fileName"
placeholder="请输入" placeholder="请输入"
...@@ -135,17 +139,17 @@ ...@@ -135,17 +139,17 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="文件版本"> <el-form-item label="文件版本" prop="fileVersion">
<el-input <el-input
v-model="fileData.enterpriseName" v-model="fileData.fileVersion"
placeholder="请输入" placeholder="请输入"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="发布日期"> <el-form-item label="发布日期" prop="releaseDate">
<el-date-picker <el-date-picker
v-model="value1" v-model="fileData.releaseDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
style="width: 100%" style="width: 100%"
...@@ -156,7 +160,7 @@ ...@@ -156,7 +160,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="文件状态"> <el-form-item label="文件状态" prop="fileStatus">
<el-select <el-select
v-model="fileData.fileStatus" v-model="fileData.fileStatus"
placeholder="请选择" placeholder="请选择"
...@@ -173,9 +177,9 @@ ...@@ -173,9 +177,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="存储位置"> <el-form-item label="存储位置" prop="storageLocation">
<el-input <el-input
v-model="fileData.fileName" v-model="fileData.storageLocation"
placeholder="请输入" placeholder="请输入"
></el-input> ></el-input>
</el-form-item> </el-form-item>
...@@ -183,15 +187,18 @@ ...@@ -183,15 +187,18 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="文件识别号"> <el-form-item
label="文件识别号"
prop="fileIdentification"
>
<el-input <el-input
v-model="fileData.enterpriseName" v-model="fileData.fileIdentification"
placeholder="请输入" placeholder="请输入"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="文件照片"> <el-form-item label="文件照片" prop="filePicture">
<ImageUpload <ImageUpload
v-model="fileData.filePicture" v-model="fileData.filePicture"
:limit="1" :limit="1"
...@@ -200,6 +207,12 @@ ...@@ -200,6 +207,12 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-button
type="primary"
icon="el-icon-folder-add"
@click="handleSaveFile"
>保存车企文件</el-button
>
</el-card> </el-card>
</el-form-item> </el-form-item>
<el-form-item label="条目填写人"> <el-form-item label="条目填写人">
...@@ -214,6 +227,85 @@ ...@@ -214,6 +227,85 @@
<el-button type="primary">提交问卷</el-button> <el-button type="primary">提交问卷</el-button>
</div> </div>
</el-card> </el-card>
<!-- 新增场景对话框 -->
<el-dialog
title="新增场景对话框"
:visible.sync="senceDialogVisible"
width="30%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="handleSceneClose"
>
<div class="file-prompt">
<div>
<i
class="el-icon-info"
/>新增场景，需要组织评审，评审通过后新增场景自动进入场景库。
</div>
</div>
<el-form
ref="sceneForm"
:model="sceneForm"
:rules="sceneRules"
label-width="80px"
class="scene-form"
>
<el-form-item label="评审类型" prop="reviewType">
<!-- 下拉框 -->
<el-select
v-model="sceneForm.reviewType"
placeholder="请选择评审类型"
>
<el-option
v-for="item in reviewTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="场景分类" prop="sceneClassification">
<el-select
v-model="sceneForm.sceneClassification"
placeholder="请选择评审类型"
>
<el-option
v-for="item in reviewTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="场景内容" prop="sceneContent">
<el-input
v-model="sceneForm.sceneContent"
maxlength="100"
show-word-limit
type="textarea"
/>
</el-form-item>
<el-form-item label="评审人员" prop="assessor">
<div>组长-xxx</div>
<div>组员-xxx、xxx、xxx</div>
</el-form-item>
<el-form-item label="备注信息" prop="remark">
<el-input
v-model="sceneForm.remark"
maxlength="100"
show-word-limit
type="textarea"
/>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="senceDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="handleSaveNewScene">
确 定
</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -222,6 +314,8 @@ export default { ...@@ -222,6 +314,8 @@ export default {
dicts: ['file_status'], dicts: ['file_status'],
data() { data() {
return { return {
sceneForm: {},
senceDialogVisible: false,
form: {}, form: {},
checked: false, checked: false,
circleList: [ circleList: [
...@@ -236,6 +330,43 @@ export default { ...@@ -236,6 +330,43 @@ export default {
{ id: 9, checked: false }, { id: 9, checked: false },
{ id: 10, checked: false } { id: 10, checked: false }
], ],
fileRules: {
enterpriseName: [
{ required: true, message: '请输入企业名称', trigger: 'blur' }
],
fileName: [
{ required: true, message: '请输入文件名称', trigger: 'blur' }
],
fileVersion: [
{ required: true, message: '请输入文件版本', trigger: 'blur' }
],
releaseDate: [
{ required: true, message: '请选择发布日期', trigger: 'change' }
],
fileStatus: [
{ required: true, message: '请选择文件状态', trigger: 'change' }
],
storageLocation: [
{ required: true, message: '请输入存储位置', trigger: 'blur' }
],
fileIdentification: [
{ required: true, message: '请输入文件识别号', trigger: 'blur' }
],
filePicture: [
{ required: true, message: '请选择文件照片', trigger: 'change' }
]
},
sceneRules: {
reviewType: [
{ required: true, message: '请选择评审类型', trigger: 'change' }
],
sceneClassification: [
{ required: true, message: '请选择场景分类', trigger: 'change' }
],
sceneContent: [
{ required: true, message: '请输入场景内容', trigger: 'blur' }
]
},
// TODO 删除 // TODO 删除
checkedTwo: false, checkedTwo: false,
checkedThree: false, checkedThree: false,
...@@ -246,9 +377,11 @@ export default { ...@@ -246,9 +377,11 @@ export default {
fileData: { fileData: {
enterpriseName: '', enterpriseName: '',
fileStatus: '', fileStatus: '',
filePicture: '' filePicture: '',
storageLocation: ''
}, },
value1: '' value1: '',
reviewTypeOptions: []
} }
}, },
methods: { methods: {
...@@ -265,6 +398,32 @@ export default { ...@@ -265,6 +398,32 @@ export default {
// 返回 // 返回
handleBack() { handleBack() {
this.$router.go(-1) this.$router.go(-1)
},
// 新增场景
handleAddScene() {
this.senceDialogVisible = true
console.log('a')
},
// 新增场景对话框关闭时触发的回调函数
handleSceneClose() {
this.senceDialogVisible = false
this.$refs.sceneForm.resetFields()
},
handleSaveFile() {
// vue表单校验
this.$refs.fileRef.validate(valid => {
if (valid) {
console.log('ddd')
}
})
},
handleSaveNewScene() {
// vue表单校验vue表单校验
this.$refs.sceneForm.validate(valid => {
if (valid) {
console.log('ddd')
}
})
} }
} }
} }
...@@ -352,7 +511,7 @@ export default { ...@@ -352,7 +511,7 @@ export default {
.file-prompt { .file-prompt {
margin: 10px 0 10px 0; margin: 10px 0 10px 0;
background-color: #ebf5ff; background-color: #ebf5ff;
span { div {
padding-left: 10px; padding-left: 10px;
i { i {
color: #409eff; color: #409eff;
...@@ -368,4 +527,16 @@ export default { ...@@ -368,4 +527,16 @@ export default {
} }
} }
} }
.file-prompt {
margin: 10px 0 10px 0;
padding: 10px;
background-color: #ebf5ff;
div {
padding-left: 10px;
i {
color: #409eff;
margin-right: 10px;
}
}
}
</style> </style>
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