Skip to content

W
web
Commit 5b70c2c7 authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

feat(任务处理): 审查表单关联企业文件

parent 03b21795
Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 96 deletions
src/api/task/task.js
View file @ 5b70c2c7
...@@ -13,7 +13,7 @@ export function taskDetail(data) { ...@@ -13,7 +13,7 @@ export function taskDetail(data) {
//体系审查获取任务详情 //体系审查获取任务详情
export function reviewTaskDetail(data) { export function reviewTaskDetail(data) {
return request({ return request({
url: '/system/review/task/view', url: '/system/review/task/getById',
method: 'post', method: 'post',
data data
}) })
...@@ -76,7 +76,7 @@ export function submitReview(data) { ...@@ -76,7 +76,7 @@ export function submitReview(data) {
// 查看车辆问卷审查任务详情 // 查看车辆问卷审查任务详情
export function checkTaskDetail(data) { export function checkTaskDetail(data) {
return request({ return request({
url: '/car/review/task/view', url: '/car/review/task/getById',
method: 'post', method: 'post',
data data
}) })
......
src/assets/styles/process.scss
View file @ 5b70c2c7
...@@ -670,3 +670,12 @@ ...@@ -670,3 +670,12 @@
color: #606266; color: #606266;
} }
} }
.button-bar {
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
.page-btn {
margin: 0 10px;
}
}
src/utils/ModelDataSource.js
View file @ 5b70c2c7
...@@ -93,16 +93,7 @@ ...@@ -93,16 +93,7 @@
data: _.omit(self, ['vm', 'settings', 'errors', 'debug']) data: _.omit(self, ['vm', 'settings', 'errors', 'debug'])
}) })
.then(function (response) { .then(function (response) {
if (response.data) { successCallback(response)
for (let key in response.data) {
self[key] = response.data[key]
}
} else {
for (let key in response.data) {
self[key] = response.data[key]
}
}
successCallback()
}) })
.catch(function (error) { .catch(function (error) {
// console.log(error.response) // console.log(error.response)
......
src/views/processing/carReview/source-record/index.vue
View file @ 5b70c2c7
...@@ -140,7 +140,8 @@ ...@@ -140,7 +140,8 @@
</div> </div>
<div class="standard-result"> <div class="standard-result">
审查结果： 审查结果：
<span class="green">符合</span> <span v-if="item.passed == 1" class="green">符合</span>
<span v-else class="red">不符合</span>
</div> </div>
</div> </div>
</span> </span>
......
src/views/processing/carReview/vehicle-type/index.vue
View file @ 5b70c2c7
...@@ -140,7 +140,8 @@ ...@@ -140,7 +140,8 @@
</div> </div>
<div class="standard-result"> <div class="standard-result">
审查结果： 审查结果：
<span class="green">符合</span> <span v-if="item.passed == 1" class="green">符合</span>
<span v-else class="red">不符合</span>
</div> </div>
</div> </div>
</span> </span>
...@@ -350,7 +351,14 @@ export default { ...@@ -350,7 +351,14 @@ export default {
/* 返回跳转*/ /* 返回跳转*/
goToProcessedReview() { goToProcessedReview() {
this.ruleForm.taskId = this.taskId this.ruleForm.taskId = this.taskId
carTaskSubmit(this.ruleForm).then(res => { const formData = {
imagesUrl: [
this.ruleForm.enterpriseLeader,
this.ruleForm.inspectionLeader
],
taskId: this.taskId
}
carTaskSubmit(formData).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.$modal.msgSuccess('确认提交成功') this.$modal.msgSuccess('确认提交成功')
this.$router.back() this.$router.back()
......
src/views/processing/carReview/write-check-form/components/companyFile.vue
View file @ 5b70c2c7
...@@ -182,11 +182,11 @@ export default { ...@@ -182,11 +182,11 @@ export default {
this.$refs.fileRef.validate(valid => { this.$refs.fileRef.validate(valid => {
if (valid) { if (valid) {
this.model.save( this.model.save(
() => { res => {
this.$store.dispatch('processing/getCompanyFiles', { this.$store.dispatch('processing/getCompanyFiles', {
taskId: this.$route.query.id taskId: this.$route.query.id
}) })
this.$emit('handleSave', false) this.$emit('handleSave', res.data)
}, },
errors => {} errors => {}
) )
......
src/views/processing/carReview/write-check-form/index.vue
View file @ 5b70c2c7
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
<div> <div>
章节条目或范围 章节条目或范围
<el-input <el-input
v-model="form.chapterEntry" v-model="form.catalogue"
placeholder="请输入具体章节条目或范围" placeholder="请输入具体章节条目或范围"
/> />
</div> </div>
...@@ -298,15 +298,17 @@ export default { ...@@ -298,15 +298,17 @@ export default {
passed: '', passed: '',
reviewDetailsId: '', reviewDetailsId: '',
taskId: '', taskId: '',
chapterEntry: '', fileName: '',
fileName: '' catalogue: '',
reviewEnterpriseArchiveId: ''
}, },
oldForm: { oldForm: {
passed: '', passed: '',
reviewDetailsId: '', reviewDetailsId: '',
taskId: '', taskId: '',
chapterEntry: '', fileName: '',
fileName: '' catalogue: '',
reviewEnterpriseArchiveId: ''
}, },
model: { model: {
carReviewTask: {}, carReviewTask: {},
...@@ -320,10 +322,6 @@ export default { ...@@ -320,10 +322,6 @@ export default {
rules: { rules: {
passed: [{ required: true, message: '请选择审查结果', trigger: 'blur' }] passed: [{ required: true, message: '请选择审查结果', trigger: 'blur' }]
}, },
addData: {
fileName: '',
chapterEntry: ''
},
changeTask: [], changeTask: [],
changeTaskDetails: [], changeTaskDetails: [],
value1: '', value1: '',
...@@ -391,6 +389,7 @@ export default { ...@@ -391,6 +389,7 @@ export default {
* 企业文件保存回调 * 企业文件保存回调
*/ */
handleFileSave(element) { handleFileSave(element) {
this.form.reviewEnterpriseArchiveId = element
this.isFileUpdate = false this.isFileUpdate = false
this.formManger.show = false this.formManger.show = false
}, },
...@@ -530,30 +529,36 @@ export default { ...@@ -530,30 +529,36 @@ export default {
passed: this.taskModel.result.passed, passed: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
chapterEntry: '', fileName: '',
fileName: '' catalogue: this.taskModel.result.catalogue,
reviewEnterpriseArchiveId:
this.taskModel.result.reviewEnterpriseArchiveId
} }
this.oldForm = { this.oldForm = {
passed: this.taskModel.result.passed, passed: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
chapterEntry: '', fileName: '',
fileName: '' catalogue: this.taskModel.result.catalogue,
reviewEnterpriseArchiveId:
this.taskModel.result.reviewEnterpriseArchiveId
} }
} else { } else {
this.form = { this.form = {
passed: '', passed: '',
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
chapterEntry: '', fileName: '',
fileName: '' catalogue: '',
reviewEnterpriseArchiveId: ''
} }
this.oldForm = { this.oldForm = {
passed: '', passed: '',
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
chapterEntry: '', fileName: '',
fileName: '' catalogue: '',
reviewEnterpriseArchiveId: ''
} }
} }
} else { } else {
......
src/views/processing/fileLibrary/components/dialog.vue
View file @ 5b70c2c7
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
} }
} }
}, },
dicts: ['sys_scene_type'], dicts: ['file_status'],
data() { data() {
return { return {
model: this.$modelDataSource({ model: this.$modelDataSource({
...@@ -165,9 +165,15 @@ export default { ...@@ -165,9 +165,15 @@ export default {
this.$emit('close') this.$emit('close')
}, },
handleConfirm() { handleConfirm() {
this.$refs['form'].validate(valid => { this.$refs['fileRef'].validate(valid => {
if (valid) { if (valid) {
console.log('校验', '111') this.model.save(
() => {
this.dialogManger.dialogVisible = false
this.$emit('refresh')
},
errors => {}
)
} }
}) })
} }
......
src/views/processing/fileLibrary/index.vue
View file @ 5b70c2c7
...@@ -44,12 +44,12 @@ ...@@ -44,12 +44,12 @@
> >
</el-form-item> </el-form-item>
</template> </template>
<el-form-item> <!-- <el-form-item>
<right-toolbar <right-toolbar
:show-search.sync="showSearch" :show-search.sync="showSearch"
@queryTable="loadData" @queryTable="loadData"
></right-toolbar> ></right-toolbar>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<el-table <el-table
v-loading="tableLoading" v-loading="tableLoading"
......
src/views/processing/processed-review/index.vue
View file @ 5b70c2c7
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</template> </template>
<el-form-item> <!-- <el-form-item>
<right-toolbar <right-toolbar
:show-search.sync="showSearch" :show-search.sync="showSearch"
@queryTable="loadData" @queryTable="loadData"
></right-toolbar> ></right-toolbar>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div v-loading="loading"> <div v-loading="loading">
<template v-if="tableData.length"> <template v-if="tableData.length">
......
src/views/processing/systemReview/confirm-result/index.vue
View file @ 5b70c2c7
...@@ -140,7 +140,8 @@ ...@@ -140,7 +140,8 @@
</div> </div>
<div class="standard-result"> <div class="standard-result">
审查结果： 审查结果：
<span class="green">符合</span> <span v-if="item.passed == 1" class="green">符合</span>
<span v-else class="red">不符合</span>
</div> </div>
</div> </div>
</span> </span>
...@@ -253,8 +254,8 @@ export default { ...@@ -253,8 +254,8 @@ export default {
}, },
columns: [], columns: [],
ruleForm: { ruleForm: {
enterpriseLeader: '', enterpriseLeader: 'test',
inspectionLeader: '' inspectionLeader: 'test'
}, },
rules: { rules: {
enterpriseLeader: [ enterpriseLeader: [
...@@ -295,7 +296,14 @@ export default { ...@@ -295,7 +296,14 @@ export default {
/* 返回跳转*/ /* 返回跳转*/
goToProcessedReview() { goToProcessedReview() {
this.ruleForm.taskId = this.taskId this.ruleForm.taskId = this.taskId
taskSubmit(this.ruleForm).then(res => { const formData = {
imagesUrl: [
this.ruleForm.enterpriseLeader,
this.ruleForm.inspectionLeader
],
taskId: this.taskId
}
taskSubmit(formData).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.$modal.msgSuccess('确认提交成功') this.$modal.msgSuccess('确认提交成功')
this.$router.back() this.$router.back()
......
src/views/processing/systemReview/source-record/index.vue
View file @ 5b70c2c7
...@@ -140,7 +140,8 @@ ...@@ -140,7 +140,8 @@
</div> </div>
<div class="standard-result"> <div class="standard-result">
审查结果： 审查结果：
<span class="green">符合</span> <span v-if="item.passed == 1" class="green">符合</span>
<span v-else class="red">不符合</span>
</div> </div>
</div> </div>
</span> </span>
......
src/views/processing/systemReview/write-check-form/components/companyFile.vue
View file @ 5b70c2c7
...@@ -182,11 +182,11 @@ export default { ...@@ -182,11 +182,11 @@ export default {
this.$refs.fileRef.validate(valid => { this.$refs.fileRef.validate(valid => {
if (valid) { if (valid) {
this.model.save( this.model.save(
() => { res => {
this.$store.dispatch('processing/getCompanyFiles', { this.$store.dispatch('processing/getCompanyFiles', {
taskId: this.$route.query.id taskId: this.$route.query.id
}) })
this.$emit('handleSave', false) this.$emit('handleSave', res.data)
}, },
errors => {} errors => {}
) )
......
src/views/processing/systemReview/write-check-form/index.vue
View file @ 5b70c2c7
...@@ -303,15 +303,17 @@ export default { ...@@ -303,15 +303,17 @@ export default {
passed: '', passed: '',
reviewDetailsId: '', reviewDetailsId: '',
taskId: '', taskId: '',
chapterEntry: '', fileName: '',
fileName: '' catalogue: '',
reviewEnterpriseArchiveId: ''
}, },
oldForm: { oldForm: {
passed: '', passed: '',
reviewDetailsId: '', reviewDetailsId: '',
taskId: '', taskId: '',
chapterEntry: '', fileName: '',
fileName: '' catalogue: '',
reviewEnterpriseArchiveId: ''
}, },
model: { model: {
systemReviewTask: {}, systemReviewTask: {},
...@@ -396,6 +398,7 @@ export default { ...@@ -396,6 +398,7 @@ export default {
* 企业文件保存回调 * 企业文件保存回调
*/ */
handleFileSave(element) { handleFileSave(element) {
this.form.reviewEnterpriseArchiveId = element
this.isFileUpdate = false this.isFileUpdate = false
this.formManger.show = false this.formManger.show = false
}, },
...@@ -529,36 +532,41 @@ export default { ...@@ -529,36 +532,41 @@ export default {
this.activeModel = index this.activeModel = index
if (this.detailsList.length) { if (this.detailsList.length) {
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, passed: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
chapterEntry: '', fileName: '',
fileName: '' catalogue: this.taskModel.result.catalogue,
reviewEnterpriseArchiveId:
this.taskModel.result.reviewEnterpriseArchiveId
} }
this.oldForm = { this.oldForm = {
passed: this.taskModel.result.passed, passed: this.taskModel.result.passed,
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
chapterEntry: '', fileName: '',
fileName: '' catalogue: this.taskModel.result.catalogue,
reviewEnterpriseArchiveId:
this.taskModel.result.reviewEnterpriseArchiveId
} }
} else { } else {
this.form = { this.form = {
passed: '', passed: '',
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
chapterEntry: '', fileName: '',
fileName: '' catalogue: '',
reviewEnterpriseArchiveId: ''
} }
this.oldForm = { this.oldForm = {
passed: '', passed: '',
reviewDetailsId: this.taskModel.id, reviewDetailsId: this.taskModel.id,
taskId: this.taskId, taskId: this.taskId,
chapterEntry: '', fileName: '',
fileName: '' catalogue: '',
reviewEnterpriseArchiveId: ''
} }
} }
} else { } else {
......
src/views/processing/unprocessed-review/index.vue
View file @ 5b70c2c7
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</template> </template>
<el-form-item> <!-- <el-form-item>
<right-toolbar <right-toolbar
:show-search.sync="showSearch" :show-search.sync="showSearch"
@queryTable="loadData" @queryTable="loadData"
></right-toolbar> ></right-toolbar>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div v-loading="loading"> <div v-loading="loading">
<template v-if="tableData.length"> <template v-if="tableData.length">
......
src/views/setting/company/components/dialog.vue
View file @ 5b70c2c7
...@@ -11,14 +11,18 @@ ...@@ -11,14 +11,18 @@
ref="form" ref="form"
class="company-form" class="company-form"
label-width="120px" label-width="120px"
label-position="right" label-position="top"
:model="model" :model="model"
:rules="rules" :rules="rules"
> >
<el-form-item label="企业名称：" prop="enterpriseName"> <el-form-item label="企业名称" prop="enterpriseName">
<el-input v-model="model.enterpriseName" placeholder="请输入企业名称" /> <el-input
v-model="model.enterpriseName"
class="w-100"
placeholder="请输入企业名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="地址：" prop="address"> <el-form-item label="地址" prop="address">
<el-input <el-input
v-model="model.address" v-model="model.address"
type="textarea" type="textarea"
...@@ -28,10 +32,10 @@ ...@@ -28,10 +32,10 @@
placeholder="请输入地址" placeholder="请输入地址"
/> />
</el-form-item> </el-form-item>
<el-form-item label="邮编：" prop="postcode"> <el-form-item label="邮编" prop="postcode">
<el-input v-model="model.postcode" placeholder="请输入邮编" /> <el-input v-model="model.postcode" placeholder="请输入邮编" />
</el-form-item> </el-form-item>
<el-form-item label="企业联系人：" prop="enterpriseContact"> <el-form-item label="企业联系人" prop="enterpriseContact">
<el-input <el-input
v-model="model.enterpriseContact" v-model="model.enterpriseContact"
placeholder="请输入企业联系人" placeholder="请输入企业联系人"
...@@ -142,8 +146,3 @@ export default { ...@@ -142,8 +146,3 @@ export default {
} }
} }
</script> </script>
<style lang="scss" scoped>
.company-form {
width: 80%;
}
</style>
src/views/setting/company/index.vue
View file @ 5b70c2c7
...@@ -55,12 +55,12 @@ ...@@ -55,12 +55,12 @@
> >
</el-form-item> </el-form-item>
</template> </template>
<el-form-item> <!-- <el-form-item>
<right-toolbar <right-toolbar
:show-search.sync="showSearch" :show-search.sync="showSearch"
@queryTable="loadData" @queryTable="loadData"
></right-toolbar> ></right-toolbar>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<el-row :gutter="10" class="mb10"> <el-row :gutter="10" class="mb10">
...@@ -143,24 +143,20 @@ ...@@ -143,24 +143,20 @@
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <div class="button-bar">
v-hasPermi="['setting:company:update']" <page-button
size="mini" v-hasPermi="['setting:standard:update']"
type="text" icon="edit"
icon="el-icon-edit" title="修改"
plain @click.native="handleUpdate(scope.row.id)"
@click="handleUpdate(scope.row.id)" ></page-button>
>修改</el-button <page-button
> v-hasPermi="['setting:standard:update']"
<el-button icon="delete"
v-hasPermi="['setting:company:delete']" title="删除"
size="mini" @click.native="handleDelete(scope.row.id)"
type="text" ></page-button>
icon="el-icon-delete" </div>
plain
@click="handleDelete(scope.row.id)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/views/task/on/index.vue
View file @ 5b70c2c7
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</template> </template>
<el-form-item> <!-- <el-form-item>
<right-toolbar <right-toolbar
:show-search.sync="showSearch" :show-search.sync="showSearch"
@queryTable="loadData" @queryTable="loadData"
></right-toolbar> ></right-toolbar>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div v-loading="loading"> <div v-loading="loading">
<template v-if="tableData.length"> <template v-if="tableData.length">
......
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