Skip to content

W
web
Commit 70f9c590 authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

feat: 修改填报页面

parent 41cc3154
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 86 deletions
src/views/processing/carReview/review-form/index.vue
View file @ 70f9c590
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> --> </div> -->
<el-form> <el-form>
<el-row gutter="20"> <el-row gutter="20">
<el-col :span="6"> <el-col :span="4">
<el-form-item label="任务编号"> <el-form-item label="任务编号">
<el-input <el-input
v-model="model.carReviewTask.taskNo" v-model="model.carReviewTask.taskNo"
...@@ -52,17 +52,18 @@ ...@@ -52,17 +52,18 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<el-form-item label="任务名称"> <el-form-item label="任务名称">
<el-input v-model="task.taskName" type="text" disabled /> <el-input v-model="task.taskName" type="text" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<el-form-item label="委托单位"> <el-form-item label="委托单位">
<el-input v-model="task.entrustedUnit" type="text" disabled /> <el-input v-model="task.entrustedUnit" type="text" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="任务状态"> <el-form-item label="任务状态">
<el-input <el-input
type="text" type="text"
...@@ -76,6 +77,15 @@ ...@@ -76,6 +77,15 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="厂商名称">
<el-input
type="text"
disabled
:value="model.carReviewTask.enterpriseName"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<!--审查表单概要--> <!--审查表单概要-->
......
src/views/processing/carReview/source-record/index.vue
View file @ 70f9c590
...@@ -41,6 +41,12 @@ ...@@ -41,6 +41,12 @@
}} }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">厂商名称:</span>
<span class="task-content">
{{ model.carReviewTask.enterpriseName }}
</span>
</div>
</div> </div>
<div class="task-body"> <div class="task-body">
<!--card统计值--> <!--card统计值-->
......
src/views/processing/carReview/vehicle-type/index.vue
View file @ 70f9c590
...@@ -41,6 +41,12 @@ ...@@ -41,6 +41,12 @@
}} }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">厂商名称:</span>
<span class="task-content">
{{ model.carReviewTask.enterpriseName }}
</span>
</div>
</div> </div>
<div class="task-body"> <div class="task-body">
<!--card统计值--> <!--card统计值-->
......
src/views/processing/carReview/write-check-form/index.vue
View file @ 70f9c590
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
}} }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">厂商名称:</span>
<span class="task-content">
{{ model.carReviewTask.enterpriseName }}
</span>
</div>
</div> </div>
<div class="prompt-message"> <div class="prompt-message">
<i class="icon el-icon-info"></i> <i class="icon el-icon-info"></i>
...@@ -97,7 +103,7 @@ ...@@ -97,7 +103,7 @@
:class="{ :class="{
'select-circle': index === activeModel, 'select-circle': index === activeModel,
'exclamation-point': item.warn 'exclamation-point': item.warn
}" }"
@click="changeStep(index)" @click="changeStep(index)"
> >
<svg-icon <svg-icon
...@@ -230,8 +236,16 @@ ...@@ -230,8 +236,16 @@
prop="passed" prop="passed"
> >
<el-radio-group v-model="form.passed"> <el-radio-group v-model="form.passed">
<el-radio :label="1" @click.native="onRadioChange($event,'1')">符合</el-radio> <el-radio
<el-radio :label="0" @click.native="onRadioChange($event,'0')">不符合</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-radio-group>
</el-form-item> </el-form-item>
<el-form-item class="right-content-item" label="相关记录"> <el-form-item class="right-content-item" label="相关记录">
...@@ -278,13 +292,14 @@ ...@@ -278,13 +292,14 @@
</div> </div>
</el-col> </el-col>
<el-col :span="1" :offset="1"> <el-col :span="1" :offset="1">
<el-button <el-button
type="text" type="text"
size="default" size="default"
style="margin-top: 20px" style="margin-top: 20px"
@click="editFile(file)" @click="editFile(file)"
v-if="file && file.id" v-if="file && file.id"
>编辑文件</el-button> >编辑文件</el-button
>
</el-col> </el-col>
<el-col :span="1" :offset="1"> <el-col :span="1" :offset="1">
<el-button <el-button
...@@ -401,7 +416,7 @@ export default { ...@@ -401,7 +416,7 @@ export default {
'preview-view': previewView, 'preview-view': previewView,
'scene-view': sceneView, 'scene-view': sceneView,
'company-file': companyFile, 'company-file': companyFile,
'edit-dialog' : editDialog 'edit-dialog': editDialog
}, },
mixins: [routerMixins], mixins: [routerMixins],
dicts: ['test_cartype_type'], dicts: ['test_cartype_type'],
...@@ -464,8 +479,8 @@ export default { ...@@ -464,8 +479,8 @@ export default {
loading: false, loading: false,
dialogManger: { dialogManger: {
dialogVisible: false, dialogVisible: false,
editFileId:'', editFileId: ''
}, }
} }
}, },
computed: { computed: {
...@@ -545,15 +560,15 @@ export default { ...@@ -545,15 +560,15 @@ export default {
this.handleCircle(0) this.handleCircle(0)
}, },
methods: { methods: {
editFile(file){ editFile(file) {
//let fileObj = this.detailsList[this.currentIndex].result.fileList[key] || file //let fileObj = this.detailsList[this.currentIndex].result.fileList[key] || file
request({ request({
url: '/review/enterprise/archive/getById', url: '/review/enterprise/archive/getById',
method: 'post', method: 'post',
data: { data: {
id: file.id id: file.id
} }
}).then(res=>{ }).then(res => {
this.dialogManger.file = res.data this.dialogManger.file = res.data
this.dialogManger.dialogVisible = true this.dialogManger.dialogVisible = true
}) })
...@@ -564,18 +579,17 @@ export default { ...@@ -564,18 +579,17 @@ export default {
* method:post * method:post
* data:{ id: fileObj.id} * data:{ id: fileObj.id}
* }).then(res=>{ * }).then(res=>{
* *
* }) * })
* *
*/ */
}, },
onRadioChange(e,passed) { onRadioChange(e, passed) {
if(e.target.tagName == 'INPUT'){ if (e.target.tagName == 'INPUT') {
if (passed == this.form.passed) { if (passed == this.form.passed) {
this.form.passed = ""; this.form.passed = ''
}else{ } else {
this.form.passed = passed; this.form.passed = passed
} }
} }
}, },
...@@ -750,8 +764,7 @@ export default { ...@@ -750,8 +764,7 @@ export default {
!this.allPropertiesCheck(this.form.fileList, 'isFileUpdate') !this.allPropertiesCheck(this.form.fileList, 'isFileUpdate')
) { ) {
this.handleCircle(index) this.handleCircle(index)
} } else {
else {
this.$message.error('您有未保存内容，请点击保存按钮') this.$message.error('您有未保存内容，请点击保存按钮')
} }
}, },
...@@ -789,14 +802,20 @@ export default { ...@@ -789,14 +802,20 @@ export default {
this.taskModel = JSON.parse(JSON.stringify(this.detailsList[index])) this.taskModel = JSON.parse(JSON.stringify(this.detailsList[index]))
if (this.taskModel.result) { if (this.taskModel.result) {
this.form = { this.form = {
passed: this.taskModel.result.passed == null ? '' : this.taskModel.result.passed, passed:
this.taskModel.result.passed == null
? ''
: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
comment: this.taskModel.result.comment, comment: this.taskModel.result.comment,
fileList: this.taskModel.result.fileList fileList: this.taskModel.result.fileList
} }
this.oldForm = { this.oldForm = {
passed: this.taskModel.result.passed == null ? '' : this.taskModel.result.passed, passed:
this.taskModel.result.passed == null
? ''
: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
comment: this.taskModel.result.comment, comment: this.taskModel.result.comment,
...@@ -850,14 +869,16 @@ export default { ...@@ -850,14 +869,16 @@ export default {
file.id = null // 未找到则将审核企业档案ID设为null file.id = null // 未找到则将审核企业档案ID设为null
} }
}) })
if(this.form.fileList.find(item => item.id == '' || item.id == null)){ if (
this.$message({ this.form.fileList.find(item => item.id == '' || item.id == null)
message: '存在未保存的文件', ) {
type: 'warning' this.$message({
}); message: '存在未保存的文件',
this.loading = false type: 'warning'
return; })
} this.loading = false
return
}
reviewDetailsSubmit(this.form).then(async res => { reviewDetailsSubmit(this.form).then(async res => {
if (res.code === 200) { if (res.code === 200) {
await this.getTask() await this.getTask()
...@@ -962,6 +983,6 @@ export default { ...@@ -962,6 +983,6 @@ export default {
listEl.style.left = '-' + (leftMove + 180) + 'px' listEl.style.left = '-' + (leftMove + 180) + 'px'
} }
} }
}, }
} }
</script> </script>
src/views/processing/systemReview/confirm-result/index.vue
View file @ 70f9c590
...@@ -46,6 +46,12 @@ ...@@ -46,6 +46,12 @@
}} }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">厂商名称:</span>
<span class="task-content">
{{ model.systemReviewTask.enterpriseName }}
</span>
</div>
</div> </div>
<div class="task-body"> <div class="task-body">
<!--card统计值--> <!--card统计值-->
......
src/views/processing/systemReview/review-form/index.vue
View file @ 70f9c590
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<!--任务编号,名称,单位--> <!--任务编号,名称,单位-->
<el-form> <el-form>
<el-row gutter="20"> <el-row gutter="20">
<el-col :span="6"> <el-col :span="4">
<el-form-item label="任务编号"> <el-form-item label="任务编号">
<el-input <el-input
v-model="model.systemReviewTask.taskNo" v-model="model.systemReviewTask.taskNo"
...@@ -25,17 +25,17 @@ ...@@ -25,17 +25,17 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<el-form-item label="任务名称"> <el-form-item label="任务名称">
<el-input v-model="task.taskName" type="text" disabled /> <el-input v-model="task.taskName" type="text" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<el-form-item label="委托单位"> <el-form-item label="委托单位">
<el-input v-model="task.entrustedUnit" type="text" disabled /> <el-input v-model="task.entrustedUnit" type="text" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<el-form-item label="任务状态"> <el-form-item label="任务状态">
<el-input <el-input
type="text" type="text"
...@@ -49,6 +49,15 @@ ...@@ -49,6 +49,15 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="厂商名称">
<el-input
type="text"
disabled
:value="model.systemReviewTask.enterpriseName"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<!--审查表单概要--> <!--审查表单概要-->
......
src/views/processing/systemReview/source-record/index.vue
View file @ 70f9c590
...@@ -46,6 +46,12 @@ ...@@ -46,6 +46,12 @@
}} }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">厂商名称:</span>
<span class="task-content">
{{ model.systemReviewTask.enterpriseName }}
</span>
</div>
</div> </div>
<div class="task-body"> <div class="task-body">
<!--card统计值--> <!--card统计值-->
...@@ -195,7 +201,9 @@ ...@@ -195,7 +201,9 @@
> >
<tr> <tr>
<td align="center"> <td align="center">
<span style="white-space: pre-wrap;">{{ reviewDetail.text | ellipsis }}</span> <span style="white-space: pre-wrap">{{
reviewDetail.text | ellipsis
}}</span>
</td> </td>
<td align="center" class="investigate-result"> <td align="center" class="investigate-result">
<div v-if="reviewDetail.result"> <div v-if="reviewDetail.result">
...@@ -399,8 +407,10 @@ export default { ...@@ -399,8 +407,10 @@ export default {
this.model = res.data this.model = res.data
if (this.model.systemReviewTask.imagesUrl) { if (this.model.systemReviewTask.imagesUrl) {
const imgs = this.model.systemReviewTask.imagesUrl.split(',') const imgs = this.model.systemReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader = process.env.VUE_APP_IMAGE_API + imgs[0] || '' this.ruleForm.enterpriseLeader =
this.ruleForm.inspectionLeader = process.env.VUE_APP_IMAGE_API + imgs[1] || '' process.env.VUE_APP_IMAGE_API + imgs[0] || ''
this.ruleForm.inspectionLeader =
process.env.VUE_APP_IMAGE_API + imgs[1] || ''
} }
} else { } else {
this.$modal.msgError(res.msg) this.$modal.msgError(res.msg)
......
src/views/processing/systemReview/write-check-form/index.vue
View file @ 70f9c590
...@@ -60,6 +60,12 @@ ...@@ -60,6 +60,12 @@
}} }}
</span> </span>
</div> </div>
<div class="task-item">
<span class="task-label">厂商名称:</span>
<span class="task-content">
{{ model.systemReviewTask.enterpriseName }}
</span>
</div>
</div> </div>
<div class="prompt-message"> <div class="prompt-message">
<i class="icon el-icon-info"></i> <i class="icon el-icon-info"></i>
...@@ -119,7 +125,7 @@ ...@@ -119,7 +125,7 @@
class="tick-class" class="tick-class"
icon-class="tag_weixuanzhong" icon-class="tag_weixuanzhong"
></svg-icon> ></svg-icon>
<span class="inner-text">{{ item.order }}</span> <span class="inner-text">{{ item.order }}</span>
</div> </div>
</div> </div>
...@@ -241,8 +247,16 @@ ...@@ -241,8 +247,16 @@
prop="passed" prop="passed"
> >
<el-radio-group v-model="form.passed"> <el-radio-group v-model="form.passed">
<el-radio :label="1" @click.native="onRadioChange($event,'1')">符合</el-radio> <el-radio
<el-radio :label="0" @click.native="onRadioChange($event,'0')">不符合</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-radio-group>
</el-form-item> </el-form-item>
<el-form-item class="right-content-item" label="相关记录"> <el-form-item class="right-content-item" label="相关记录">
...@@ -289,13 +303,14 @@ ...@@ -289,13 +303,14 @@
</div> </div>
</el-col> </el-col>
<el-col :span="1" :offset="1"> <el-col :span="1" :offset="1">
<el-button <el-button
type="text" type="text"
size="default" size="default"
style="margin-top: 20px" style="margin-top: 20px"
@click="editFile(file)" @click="editFile(file)"
v-if="file && file.id" v-if="file && file.id"
>编辑文件</el-button> >编辑文件</el-button
>
</el-col> </el-col>
<el-col :span="1" :offset="1"> <el-col :span="1" :offset="1">
<el-button <el-button
...@@ -415,7 +430,7 @@ export default { ...@@ -415,7 +430,7 @@ export default {
'preview-view': previewView, 'preview-view': previewView,
'scene-view': sceneView, 'scene-view': sceneView,
'company-file': companyFile, 'company-file': companyFile,
'edit-dialog' : editDialog 'edit-dialog': editDialog
}, },
mixins: [routerMixins], mixins: [routerMixins],
dicts: ['system_review_test'], dicts: ['system_review_test'],
...@@ -439,7 +454,7 @@ export default { ...@@ -439,7 +454,7 @@ export default {
}, },
dialogManger: { dialogManger: {
dialogVisible: false, dialogVisible: false,
editFileId:'', editFileId: ''
}, },
form: { form: {
passed: '', passed: '',
...@@ -487,9 +502,9 @@ export default { ...@@ -487,9 +502,9 @@ export default {
} }
}), }),
loading: false, loading: false,
choosed:'', choosed: '',
currentIndex:0, currentIndex: 0,
loading:false loading: false
} }
}, },
...@@ -570,15 +585,15 @@ export default { ...@@ -570,15 +585,15 @@ export default {
this.handleCircle(0) this.handleCircle(0)
}, },
methods: { methods: {
editFile(file){ editFile(file) {
//let fileObj = this.detailsList[this.currentIndex].result.fileList[key] || file //let fileObj = this.detailsList[this.currentIndex].result.fileList[key] || file
request({ request({
url: '/review/enterprise/archive/getById', url: '/review/enterprise/archive/getById',
method: 'post', method: 'post',
data: { data: {
id: file.id id: file.id
} }
}).then(res=>{ }).then(res => {
this.dialogManger.file = res.data this.dialogManger.file = res.data
this.dialogManger.dialogVisible = true this.dialogManger.dialogVisible = true
}) })
...@@ -589,18 +604,17 @@ export default { ...@@ -589,18 +604,17 @@ export default {
* method:post * method:post
* data:{ id: fileObj.id} * data:{ id: fileObj.id}
* }).then(res=>{ * }).then(res=>{
* *
* }) * })
* *
*/ */
}, },
onRadioChange(e,passed) { onRadioChange(e, passed) {
if(e.target.tagName == 'INPUT'){ if (e.target.tagName == 'INPUT') {
if (passed == this.form.passed) { if (passed == this.form.passed) {
this.form.passed = ""; this.form.passed = ''
}else{ } else {
this.form.passed = passed; this.form.passed = passed
} }
} }
}, },
...@@ -782,7 +796,7 @@ export default { ...@@ -782,7 +796,7 @@ export default {
if ( if (
this.isAllPropertiesEqual() && this.isAllPropertiesEqual() &&
!this.allPropertiesCheck(this.form.fileList, 'isFileUpdate') !this.allPropertiesCheck(this.form.fileList, 'isFileUpdate')
) { ) {
this.currentIndex = index this.currentIndex = index
this.handleCircle(index) this.handleCircle(index)
} else { } else {
...@@ -831,14 +845,20 @@ export default { ...@@ -831,14 +845,20 @@ export default {
console.log(this.taskModel) console.log(this.taskModel)
if (this.taskModel.result) { if (this.taskModel.result) {
this.form = { this.form = {
passed: this.taskModel.result.passed == null ? '' : this.taskModel.result.passed, passed:
this.taskModel.result.passed == null
? ''
: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
comment: this.taskModel.result.comment, comment: this.taskModel.result.comment,
fileList: this.taskModel.result.fileList || [] fileList: this.taskModel.result.fileList || []
} }
this.oldForm = { this.oldForm = {
passed: this.taskModel.result.passed == null ? '' : this.taskModel.result.passed, passed:
this.taskModel.result.passed == null
? ''
: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
comment: this.taskModel.result.comment, comment: this.taskModel.result.comment,
...@@ -878,7 +898,7 @@ export default { ...@@ -878,7 +898,7 @@ export default {
// 保存当前条目 // 保存当前条目
submitQuestionnaire(type) { submitQuestionnaire(type) {
this.loading = true this.loading = true
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
if (!this.allPropertiesCheck(this.form.fileList, 'isFileUpdate')) { if (!this.allPropertiesCheck(this.form.fileList, 'isFileUpdate')) {
...@@ -894,14 +914,16 @@ export default { ...@@ -894,14 +914,16 @@ export default {
file.id = null // 未找到则将审核企业档案ID设为null file.id = null // 未找到则将审核企业档案ID设为null
} }
}) })
if(this.form.fileList.find(item => item.id == '' || item.id == null)){ if (
this.$message({ this.form.fileList.find(item => item.id == '' || item.id == null)
message: '存在未保存的文件', ) {
type: 'warning' this.$message({
}); message: '存在未保存的文件',
this.loading = false type: 'warning'
return; })
} this.loading = false
return
}
reviewDetailsSubmit(this.form).then(async res => { reviewDetailsSubmit(this.form).then(async res => {
if (res.code === 200) { if (res.code === 200) {
await this.getTask() await this.getTask()
......
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