fix: 70470 70556 70520 70445

src/views/processing/archivedTask/index.vue

@@ -13,7 +13,7 @@
               v-for="(item, key) in standardList"
               :key="key"
               :value="item.id"
-              :label="item.standardNo + item.name"
+              :label="item.standardNo + ' ' + item.name"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -142,7 +142,7 @@
             </div>
             <div v-if="item.taskStatus === 'FINISH'" class="card-buttons">
               <el-button
-                v-if="item.reviewStatus !== 'NONE'"
+                v-if="item.systemReviewTaskId"
                 type="primary"
                 plain
                 size="mini"
@@ -155,7 +155,7 @@
                 >体系审查原始记录</el-button
               >
               <el-button
-                v-if="item.carReviewStatus !== 'NONE'"
+                v-if="item.carReviewTaskId"
                 type="primary"
                 plain
                 size="mini"
@@ -168,7 +168,7 @@
                 >车型审查原始记录</el-button
               >
               <el-button
-                v-if="item.carTestStatus !== 'NONE'"
+                v-if="item.carReviewTaskId"
                 type="primary"
                 plain
                 size="mini"

src/views/processing/carReview/write-check-form/components/companyFile.vue

@@ -184,6 +184,7 @@ export default {
         if (valid) {
           this.model.save(
             res => {
+              this.model.reset()
               this.$store.dispatch('processing/getCompanyFiles', {
                 taskId: this.$route.query.taskId
               })

src/views/processing/carReview/write-check-form/components/previewView.vue

@@ -54,7 +54,7 @@
               </div>
               <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 class="orange">不符合</span>
               </div>

src/views/processing/processed-review/index.vue

@@ -13,7 +13,7 @@
               v-for="(item, key) in standardList"
               :key="key"
               :value="item.id"
-              :label="item.standardNo + item.name"
+              :label="item.standardNo + ' ' + item.name"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -140,7 +140,7 @@
             </div>
             <div class="card-buttons">
               <el-button
-                v-if="item.reviewStatus !== 'NONE'"
+                v-if="item.systemReviewTaskId"
                 type="primary"
                 plain
                 size="mini"
@@ -153,7 +153,7 @@
                 >体系审查原始记录</el-button
               >
               <el-button
-                v-if="item.carReviewStatus !== 'NONE'"
+                v-if="item.carReviewTaskId"
                 type="primary"
                 plain
                 size="mini"
@@ -166,7 +166,7 @@
                 >车型审查原始记录</el-button
               >
               <el-button
-                v-if="item.carTestStatus !== 'NONE'"
+                v-if="item.carReviewTaskId"
                 type="primary"
                 plain
                 size="mini"

src/views/processing/systemReview/write-check-form/components/companyFile.vue

@@ -184,6 +184,7 @@ export default {
         if (valid) {
           this.model.save(
             res => {
+              this.model.reset()
               this.$store.dispatch('processing/getCompanyFiles', {
                 taskId: this.$route.query.taskId
               })

src/views/processing/systemReview/write-check-form/components/previewView.vue

@@ -54,7 +54,7 @@
               </div>
               <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 class="orange">不符合</span>
               </div>

src/views/processing/unprocessed-review/index.vue

@@ -13,7 +13,7 @@
               v-for="(item, key) in standardList"
               :key="key"
               :value="item.id"
-              :label="item.standardNo + item.name"
+              :label="item.standardNo + ' ' + item.name"
             ></el-option>
           </el-select>
         </el-form-item>

src/views/setting/company/index.vue

@@ -218,9 +218,11 @@ export default {
   methods: {
     sort_change(column, prop, order) {
       this.queryParams.pageNum = 1 // 排序后返回第一页
-      this.queryParams.isAsc = order === 'ascending' ? 'asc' : 'desc'
+      if (column.order) {
+        this.queryParams.isAsc = column.order === 'ascending' ? 'asc' : 'desc'
         this.queryParams.orderByColumn = column.prop
         this.loadData()
+      }
     },
     handleDelete(id) {
       this.$modal

src/views/task/on/index.vue

@@ -405,7 +405,7 @@
             </div>
             <div class="card-buttons">
               <el-button
-                v-if="item.reviewStatus && item.reviewStatus !== 'NONE'"
+                v-if="item.systemReviewTaskId"
                 type="primary"
                 plain
                 size="mini"
@@ -418,7 +418,7 @@
                 >体系审查原始记录</el-button
               >
               <el-button
-                v-if="item.carReviewStatus && item.carReviewStatus !== 'NONE'"
+                v-if="item.carReviewTaskId"
                 type="primary"
                 plain
                 size="mini"
@@ -431,7 +431,7 @@
                 >车型审查原始记录</el-button
               >
               <el-button
-                v-if="item.carTestStatus && item.carTestStatus !== 'NONE'"
+                v-if="item.carReviewTaskId"
                 type="primary"
                 plain
                 size="mini"