Commit ca8397bb authored by jiaxu.yan's avatar jiaxu.yan

fix: 70470 70556 70520 70445

parent ba16de0f
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
v-for="(item, key) in standardList" v-for="(item, key) in standardList"
:key="key" :key="key"
:value="item.id" :value="item.id"
:label="item.standardNo + item.name" :label="item.standardNo + ' ' + item.name"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
</div> </div>
<div v-if="item.taskStatus === 'FINISH'" class="card-buttons"> <div v-if="item.taskStatus === 'FINISH'" class="card-buttons">
<el-button <el-button
v-if="item.reviewStatus !== 'NONE'" v-if="item.systemReviewTaskId"
type="primary" type="primary"
plain plain
size="mini" size="mini"
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
>体系审查原始记录</el-button >体系审查原始记录</el-button
> >
<el-button <el-button
v-if="item.carReviewStatus !== 'NONE'" v-if="item.carReviewTaskId"
type="primary" type="primary"
plain plain
size="mini" size="mini"
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
>车型审查原始记录</el-button >车型审查原始记录</el-button
> >
<el-button <el-button
v-if="item.carTestStatus !== 'NONE'" v-if="item.carReviewTaskId"
type="primary" type="primary"
plain plain
size="mini" size="mini"
......
...@@ -184,6 +184,7 @@ export default { ...@@ -184,6 +184,7 @@ export default {
if (valid) { if (valid) {
this.model.save( this.model.save(
res => { res => {
this.model.reset()
this.$store.dispatch('processing/getCompanyFiles', { this.$store.dispatch('processing/getCompanyFiles', {
taskId: this.$route.query.taskId taskId: this.$route.query.taskId
}) })
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</div> </div>
<div class="standard-result"> <div class="standard-result">
审查结果: 审查结果:
<span v-if="item.passed === ''">__</span> <span v-if="item.passed === null">__</span>
<span v-else-if="item.passed == 1" class="green">符合</span> <span v-else-if="item.passed == 1" class="green">符合</span>
<span v-else class="orange">不符合</span> <span v-else class="orange">不符合</span>
</div> </div>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
v-for="(item, key) in standardList" v-for="(item, key) in standardList"
:key="key" :key="key"
:value="item.id" :value="item.id"
:label="item.standardNo + item.name" :label="item.standardNo + ' ' + item.name"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
</div> </div>
<div class="card-buttons"> <div class="card-buttons">
<el-button <el-button
v-if="item.reviewStatus !== 'NONE'" v-if="item.systemReviewTaskId"
type="primary" type="primary"
plain plain
size="mini" size="mini"
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
>体系审查原始记录</el-button >体系审查原始记录</el-button
> >
<el-button <el-button
v-if="item.carReviewStatus !== 'NONE'" v-if="item.carReviewTaskId"
type="primary" type="primary"
plain plain
size="mini" size="mini"
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
>车型审查原始记录</el-button >车型审查原始记录</el-button
> >
<el-button <el-button
v-if="item.carTestStatus !== 'NONE'" v-if="item.carReviewTaskId"
type="primary" type="primary"
plain plain
size="mini" size="mini"
......
...@@ -184,6 +184,7 @@ export default { ...@@ -184,6 +184,7 @@ export default {
if (valid) { if (valid) {
this.model.save( this.model.save(
res => { res => {
this.model.reset()
this.$store.dispatch('processing/getCompanyFiles', { this.$store.dispatch('processing/getCompanyFiles', {
taskId: this.$route.query.taskId taskId: this.$route.query.taskId
}) })
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</div> </div>
<div class="standard-result"> <div class="standard-result">
审查结果: 审查结果:
<span v-if="item.passed === ''">__</span> <span v-if="item.passed === null">__</span>
<span v-else-if="item.passed == 1" class="green">符合</span> <span v-else-if="item.passed == 1" class="green">符合</span>
<span v-else class="orange">不符合</span> <span v-else class="orange">不符合</span>
</div> </div>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
v-for="(item, key) in standardList" v-for="(item, key) in standardList"
:key="key" :key="key"
:value="item.id" :value="item.id"
:label="item.standardNo + item.name" :label="item.standardNo + ' ' + item.name"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
......
...@@ -218,9 +218,11 @@ export default { ...@@ -218,9 +218,11 @@ export default {
methods: { methods: {
sort_change(column, prop, order) { sort_change(column, prop, order) {
this.queryParams.pageNum = 1 // 排序后返回第一页 this.queryParams.pageNum = 1 // 排序后返回第一页
this.queryParams.isAsc = order === 'ascending' ? 'asc' : 'desc' if (column.order) {
this.queryParams.orderByColumn = column.prop this.queryParams.isAsc = column.order === 'ascending' ? 'asc' : 'desc'
this.loadData() this.queryParams.orderByColumn = column.prop
this.loadData()
}
}, },
handleDelete(id) { handleDelete(id) {
this.$modal this.$modal
......
...@@ -405,7 +405,7 @@ ...@@ -405,7 +405,7 @@
</div> </div>
<div class="card-buttons"> <div class="card-buttons">
<el-button <el-button
v-if="item.reviewStatus && item.reviewStatus !== 'NONE'" v-if="item.systemReviewTaskId"
type="primary" type="primary"
plain plain
size="mini" size="mini"
...@@ -418,7 +418,7 @@ ...@@ -418,7 +418,7 @@
>体系审查原始记录</el-button >体系审查原始记录</el-button
> >
<el-button <el-button
v-if="item.carReviewStatus && item.carReviewStatus !== 'NONE'" v-if="item.carReviewTaskId"
type="primary" type="primary"
plain plain
size="mini" size="mini"
...@@ -431,7 +431,7 @@ ...@@ -431,7 +431,7 @@
>车型审查原始记录</el-button >车型审查原始记录</el-button
> >
<el-button <el-button
v-if="item.carTestStatus && item.carTestStatus !== 'NONE'" v-if="item.carReviewTaskId"
type="primary" type="primary"
plain plain
size="mini" size="mini"
......
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