Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into developer/gaixiankang

.env.development

@@ -10,5 +10,5 @@ VUE_APP_BASE_API = '/dev-api'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 图片服务器地址
-VUE_APP_IMAGE_API = http://49.232.167.247:22039
+VUE_APP_IMAGE_API = http://49.232.167.247:22037
 

src/assets/styles/process.scss

@@ -698,6 +698,7 @@
   content: '*';
   color: #db4747;
   margin-right: 4px;
+  display: inline-block;
 }
 
 .investigate-result {

src/views/processing/carReview/review-form/index.vue

@@ -26,7 +26,7 @@
         <div class="task-item">
           <span class="task-label">委托单位:</span>
           <span class="task-content">
-            {{ model.carReviewTask.taskInitiatorDept }}
+            {{ task.entrustedUnit }}
           </span>
         </div>
         <div class="task-item">
@@ -42,12 +42,12 @@
         </div>
       </div>
 
-      <!--审查问卷概要-->
+      <!--审查表单概要-->
       <div>
         <div class="form-review-questionnaire">
           <div class="title-display">
             <span class="title-i"></span>
-            <span class="title-content">审查问卷概要</span>
+            <span class="title-content">审查表单概要</span>
             <div class="control-btns">
               <div class="control-btn" @click="openAll()">
                 <!-- <svg-icon class="iconfont" icon-class="tag_zhankai"></svg-icon> -->
@@ -72,7 +72,7 @@
               </div>
             </div>
           </div>
-          <!--审查问卷概要-->
+          <!--审查表单概要-->
           <collapse v-model="activeNames" class="mt10">
             <collapse-item
               v-for="(item, key) in model.carReviewTask.standard"
@@ -109,7 +109,27 @@
                   >
                     <tr :key="reviewDetailKey">
                       <td align="center">{{ reviewDetail.text }}</td>
-                      <td align="center" class="investigate-result">__</td>
+                      <td align="center" class="investigate-result"></td>
+                      <td align="center" class="investigate-result">
+                        <div v-if="reviewDetail.result">
+                          <div v-if="reviewDetail.result">
+                            <el-tag
+                              v-if="reviewDetail.result.passed === 1"
+                              size="medium"
+                              type="success"
+                              >符合</el-tag
+                            >
+                            <el-tag
+                              v-if="reviewDetail.result.passed === 0"
+                              size="medium"
+                              type="warning"
+                              >不符合</el-tag
+                            >
+                          </div>
+                          <div v-else>__</div>
+                        </div>
+                        <div v-else>__</div>
+                      </td>
                       <td align="center" class="written-by">
                         {{
                           reviewDetail.result

src/views/processing/carReview/source-record/index.vue

@@ -27,7 +27,7 @@
           <div class="task-item">
             <span class="task-label">委托单位:</span>
             <span class="task-content">
-              {{ model.carReviewTask.taskInitiatorDept }}
+              {{ task.entrustedUnit }}
             </span>
           </div>
           <div class="task-item">
@@ -63,7 +63,7 @@
               <div class="message-detail">
                 <div class="detail-title">审查细则符合率（%）</div>
                 <div class="detail-num mt10">
-                  {{ model.carReviewTask.detailsPass }}
+                  {{ model.carReviewTask.detailsPass }}%
                 </div>
               </div>
               <svg-icon
@@ -89,9 +89,9 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率(条)</div>
+                <div class="detail-title">标准条款通过率</div>
                 <div class="detail-num mt10">
-                  {{ model.carReviewTask.standardsPass }}
+                  {{ model.carReviewTask.standardsPass }}%
                 </div>
               </div>
               <svg-icon
@@ -119,12 +119,12 @@
         </div>
       </div>
 
-      <!--审查问卷概要-->
+      <!--审查表单概要-->
       <div>
         <div class="form-review-questionnaire">
           <div class="title-display">
             <span class="title-i"></span>
-            <span class="title-content">审查问卷概要</span>
+            <span class="title-content">审查表单概要</span>
             <div class="control-btns">
               <div class="control-btn" @click="openAll()">
                 <icon-park
@@ -148,7 +148,7 @@
               </div>
             </div>
           </div>
-          <!--审查问卷概要-->
+          <!--审查表单概要-->
           <collapse v-model="activeNames" class="mt10">
             <collapse-item
               v-for="(item, key) in model.carReviewTask.standard"
@@ -214,11 +214,10 @@
                       <td align="center">
                         <div
                           v-if="
-                            reviewDetail.result &&
-                            reviewDetail.result.enterpriseName
+                            reviewDetail.result && reviewDetail.result.fileName
                           "
                         >
-                          《{{ reviewDetail.result.enterpriseName }}》
+                          《{{ reviewDetail.result.fileName }}》
                           {{ reviewDetail.result.catalogue }}
                         </div>
                         <div v-else>__</div>

src/views/processing/carReview/vehicle-type/index.vue

@@ -27,7 +27,7 @@
           <div class="task-item">
             <span class="task-label">委托单位:</span>
             <span class="task-content">
-              {{ model.carReviewTask.taskInitiatorDept }}
+              {{ task.entrustedUnit }}
             </span>
           </div>
           <div class="task-item">
@@ -63,7 +63,7 @@
               <div class="message-detail">
                 <div class="detail-title">审查细则符合率（%）</div>
                 <div class="detail-num mt10">
-                  {{ model.carReviewTask.detailsPass }}
+                  {{ model.carReviewTask.detailsPass }} %
                 </div>
               </div>
               <svg-icon
@@ -89,9 +89,9 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率(条)</div>
+                <div class="detail-title">标准条款通过率</div>
                 <div class="detail-num mt10">
-                  {{ model.carReviewTask.standardsPass }}
+                  {{ model.carReviewTask.standardsPass }} %
                 </div>
               </div>
               <svg-icon
@@ -119,12 +119,12 @@
         </div>
       </div>
 
-      <!--审查问卷概要-->
+      <!--审查表单概要-->
       <div>
         <div class="form-review-questionnaire">
           <div class="title-display">
             <span class="title-i"></span>
-            <span class="title-content">审查问卷概要</span>
+            <span class="title-content">审查表单概要</span>
             <div class="control-btns">
               <div class="control-btn" @click="openAll()">
                 <icon-park
@@ -148,7 +148,7 @@
               </div>
             </div>
           </div>
-          <!--审查问卷概要-->
+          <!--审查表单概要-->
           <collapse v-model="activeNames" class="mt10">
             <collapse-item
               v-for="(item, key) in model.carReviewTask.standard"
@@ -431,7 +431,9 @@ export default {
       carTaskSubmit(formData).then(res => {
         if (res.code === 200) {
           this.$modal.msgSuccess('确认提交成功')
-          this.$router.back()
+          this.$router.push({
+            path: '/processing/unprocessed-review'
+          })
         } else {
           this.$modal.msgError(res.msg)
         }

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

@@ -9,7 +9,7 @@
     :close-on-press-escape="false"
     :before-close="handleClose"
   >
-    <!--审查问卷概要-->
+    <!--审查表单概要-->
     <div class="form-review-questionnaire" style="margin: 0">
       <div class="title-display">
         <span class="title-i"></span>
@@ -37,7 +37,7 @@
           </div>
         </div>
       </div>
-      <!--审查问卷概要-->
+      <!--审查表单概要-->
       <collapse v-model="activeNames" class="mt10">
         <collapse-item
           v-for="(item, key) in dialogManger.model.carReviewTask.standard"
@@ -54,7 +54,7 @@
               </div>
               <div class="standard-result">
                 审查结果：
-                <span v-if="!item.passed">__</span>
+                <span v-if="item.passed === ''">__</span>
                 <span v-else-if="item.passed == 1" class="green">符合</span>
                 <span v-else class="orange">不符合</span>
               </div>
@@ -100,12 +100,9 @@
                   </td>
                   <td align="center">
                     <div
-                      v-if="
-                        reviewDetail.result &&
-                        reviewDetail.result.enterpriseName
-                      "
+                      v-if="reviewDetail.result && reviewDetail.result.fileName"
                     >
-                      《{{ reviewDetail.result.enterpriseName }}》
+                      《{{ reviewDetail.result.fileName }}》
                       {{ reviewDetail.result.catalogue }}
                     </div>
                     <div v-else>__</div>

src/views/processing/carReview/write-check-form/index.vue

@@ -31,7 +31,7 @@
             <div class="task-item">
               <span class="task-label">委托单位:</span>
               <span class="task-content">
-                {{ model.carReviewTask.taskInitiatorDept }}
+                {{ task.entrustedUnit }}
               </span>
             </div>
             <div class="task-item">

src/views/processing/fileLibrary/index.vue

@@ -178,6 +178,7 @@
     </el-table>
     <yan-dialog
       :dialog-manger="dialogManger"
+      @refresh="refreshList = true"
       @close="dialogManger.dialogVisible = false"
     ></yan-dialog>
     <pagination
@@ -209,6 +210,7 @@ export default {
         refreshList: false,
         dialogEditId: 0
       },
+      refreshList: false,
       baseUrl: process.env.VUE_APP_IMAGE_API,
       listUrl: '/review/enterprise/archive/findEnterpriseArchiveByTaskId',
       // 表格loading状态
@@ -217,6 +219,14 @@ export default {
       tableData: []
     }
   },
+  watch: {
+    refreshList(newVal) {
+      if (newVal) {
+        this.loadData()
+        this.refreshList = false
+      }
+    }
+  },
   created() {
     this.queryParams.taskId = this.$route.query.id
   },

src/views/processing/retention-file/index.vue

@@ -34,7 +34,7 @@
       <div class="task-item">
         <span class="task-label">委托单位:</span>
         <span class="task-content">
-          {{ task.taskInitiatorDept }}
+          {{ task.entrustedUnit }}
         </span>
       </div>
     </div>

src/views/processing/systemReview/confirm-result/index.vue

@@ -32,7 +32,7 @@
           <div class="task-item">
             <span class="task-label">委托单位:</span>
             <span class="task-content">
-              {{ model.systemReviewTask.taskInitiatorDept }}
+              {{ task.entrustedUnit }}
             </span>
           </div>
           <div class="task-item">
@@ -68,7 +68,7 @@
               <div class="message-detail">
                 <div class="detail-title">审查细则符合率（%）</div>
                 <div class="detail-num mt10">
-                  {{ model.systemReviewTask.detailsPass }}
+                  {{ model.systemReviewTask.detailsPass }}%
                 </div>
               </div>
               <svg-icon
@@ -94,9 +94,9 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率(条)</div>
+                <div class="detail-title">标准条款通过率</div>
                 <div class="detail-num mt10">
-                  {{ model.systemReviewTask.standardsPass }}
+                  {{ model.systemReviewTask.standardsPass }}%
                 </div>
               </div>
               <svg-icon
@@ -124,12 +124,12 @@
         </div>
       </div>
 
-      <!--审查问卷概要-->
+      <!--审查表单概要-->
       <div>
         <div class="form-review-questionnaire">
           <div class="title-display">
             <span class="title-i"></span>
-            <span class="title-content">审查问卷概要</span>
+            <span class="title-content">审查表单概要</span>
             <div class="control-btns">
               <div class="control-btn" @click="openAll()">
                 <icon-park
@@ -153,7 +153,7 @@
               </div>
             </div>
           </div>
-          <!--审查问卷概要-->
+          <!--审查表单概要-->
           <collapse v-model="activeNames" class="mt10">
             <collapse-item
               v-for="(item, key) in model.systemReviewTask.standard"
@@ -245,8 +245,8 @@
                 <div class="img-text">暂无签字</div>
               </div>
             </div>
-            <div class="img-item label-required">
-              <div class="img-label">检验负责人</div>
+            <div class="img-item">
+              <div class="img-label label-required">检验负责人</div>
               <img
                 v-if="ruleForm.inspectionLeader"
                 class="img"

src/views/processing/systemReview/review-form/index.vue

@@ -31,7 +31,7 @@
         <div class="task-item">
           <span class="task-label">委托单位:</span>
           <span class="task-content">
-            {{ model.systemReviewTask.taskInitiatorDept }}
+            {{ task.entrustedUnit }}
           </span>
         </div>
         <div class="task-item">
@@ -47,12 +47,12 @@
         </div>
       </div>
 
-      <!--审查问卷概要-->
+      <!--审查表单概要-->
       <div>
         <div class="form-review-questionnaire">
           <div class="title-display">
             <span class="title-i"></span>
-            <span class="title-content">审查问卷概要</span>
+            <span class="title-content">审查表单概要</span>
             <div class="control-btns">
               <div class="control-btn" @click="openAll()">
                 <icon-park
@@ -76,7 +76,7 @@
               </div>
             </div>
           </div>
-          <!--审查问卷概要-->
+          <!--审查表单概要-->
           <collapse v-model="activeNames" class="mt10">
             <collapse-item
               v-for="(item, key) in model.systemReviewTask.standard"
@@ -113,7 +113,27 @@
                   >
                     <tr :key="reviewDetailKey">
                       <td align="center">{{ reviewDetail.text }}</td>
-                      <td align="center" class="investigate-result">__</td>
+                      <td align="center" class="investigate-result"></td>
+                      <td align="center" class="investigate-result">
+                        <div v-if="reviewDetail.result">
+                          <div v-if="reviewDetail.result">
+                            <el-tag
+                              v-if="reviewDetail.result.passed === 1"
+                              size="medium"
+                              type="success"
+                              >符合</el-tag
+                            >
+                            <el-tag
+                              v-if="reviewDetail.result.passed === 0"
+                              size="medium"
+                              type="warning"
+                              >不符合</el-tag
+                            >
+                          </div>
+                          <div v-else>__</div>
+                        </div>
+                        <div v-else>__</div>
+                      </td>
                       <td align="center" class="written-by">
                         {{
                           reviewDetail.result

src/views/processing/systemReview/source-record/index.vue

@@ -32,11 +32,11 @@
           <div class="task-item">
             <span class="task-label">委托单位:</span>
             <span class="task-content">
-              {{ model.systemReviewTask.taskInitiatorDept }}
+              {{ task.entrustedUnit }}
             </span>
           </div>
           <div class="task-item">
-            <span class="task-label">委托单位:</span>
+            <span class="task-label">任务状态:</span>
             <span class="task-content">
               {{
                 getDictData(
@@ -68,7 +68,7 @@
               <div class="message-detail">
                 <div class="detail-title">审查细则符合率（%）</div>
                 <div class="detail-num mt10">
-                  {{ model.systemReviewTask.detailsPass }}
+                  {{ model.systemReviewTask.detailsPass }} %
                 </div>
               </div>
               <svg-icon
@@ -94,9 +94,9 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率(条)</div>
+                <div class="detail-title">标准条款通过率</div>
                 <div class="detail-num mt10">
-                  {{ model.systemReviewTask.standardsPass }}
+                  {{ model.systemReviewTask.standardsPass }} %
                 </div>
               </div>
               <svg-icon
@@ -124,12 +124,12 @@
         </div>
       </div>
 
-      <!--审查问卷概要-->
+      <!--审查表单概要-->
       <div>
         <div class="form-review-questionnaire">
           <div class="title-display">
             <span class="title-i"></span>
-            <span class="title-content">审查问卷概要</span>
+            <span class="title-content">审查表单概要</span>
             <div class="control-btns">
               <div class="control-btn" @click="openAll()">
                 <icon-park
@@ -153,7 +153,7 @@
               </div>
             </div>
           </div>
-          <!--审查问卷概要-->
+          <!--审查表单概要-->
           <collapse v-model="activeNames" class="mt10">
             <collapse-item
               v-for="(item, key) in model.systemReviewTask.standard"
@@ -219,11 +219,10 @@
                       <td align="center">
                         <div
                           v-if="
-                            reviewDetail.result &&
-                            reviewDetail.result.enterpriseName
+                            reviewDetail.result && reviewDetail.result.fileName
                           "
                         >
-                          《{{ reviewDetail.result.enterpriseName }}》
+                          《{{ reviewDetail.result.fileName }}》
                           {{ reviewDetail.result.catalogue }}
                         </div>
                         <div v-else>__</div>

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

@@ -9,7 +9,7 @@
     :close-on-press-escape="false"
     :before-close="handleClose"
   >
-    <!--审查问卷概要-->
+    <!--审查表单概要-->
     <div class="form-review-questionnaire" style="margin: 0">
       <div class="title-display">
         <span class="title-i"></span>
@@ -37,7 +37,7 @@
           </div>
         </div>
       </div>
-      <!--审查问卷概要-->
+      <!--审查表单概要-->
       <collapse v-model="activeNames" class="mt10">
         <collapse-item
           v-for="(item, key) in dialogManger.model.systemReviewTask.standard"
@@ -54,7 +54,7 @@
               </div>
               <div class="standard-result">
                 审查结果：
-                <span v-if="!item.passed">__</span>
+                <span v-if="item.passed === ''">__</span>
                 <span v-else-if="item.passed == 1" class="green">符合</span>
                 <span v-else class="orange">不符合</span>
               </div>
@@ -100,12 +100,9 @@
                   </td>
                   <td align="center">
                     <div
-                      v-if="
-                        reviewDetail.result &&
-                        reviewDetail.result.enterpriseName
-                      "
+                      v-if="reviewDetail.result && reviewDetail.result.fileName"
                     >
-                      《{{ reviewDetail.result.enterpriseName }}》
+                      《{{ reviewDetail.result.fileName }}》
                       {{ reviewDetail.result.catalogue }}
                     </div>
                     <div v-else>__</div>

src/views/processing/systemReview/write-check-form/index.vue

@@ -36,7 +36,7 @@
             <div class="task-item">
               <span class="task-label">委托单位:</span>
               <span class="task-content">
-                {{ model.systemReviewTask.taskInitiatorDept }}
+                {{ task.entrustedUnit }}
               </span>
             </div>
             <div class="task-item">
@@ -666,8 +666,9 @@ export default {
       reviewTaskConfirm({
         taskId: this.taskId
       }).then(res => {
+        this.$modal.msgSuccess('确认提交成功')
         this.$router.push({
-          path: '/processing/systemReview/confirm-result?id=' + this.taskId
+          path: '/processing/unprocessed-review'
         })
       })
     },

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

@@ -213,8 +213,8 @@
                       item.reviewStatus !== 'FINISH'
                         ? item.reviewStatus === 'NEW'
                           ? ''
-                          : 'green'
-                        : 'yellow'
+                          : 'yellow'
+                        : 'green'
                     ]"
                   >
                     <span
@@ -228,7 +228,7 @@
                     >
                     <span v-if="item.reviewStatus !== 'NEW'"
                       >{{
-                        item.reviewStatus !== 'FINISH' ? '(共耗时' : '已耗时('
+                        item.reviewStatus !== 'FINISH' ? '(共耗时' : '(已耗时'
                       }}{{ getHourDiff(item.systemTaskBeginTime) }})</span
                     >
                   </div>
@@ -244,8 +244,8 @@
                       item.carReviewStatus !== 'FINISH'
                         ? item.carReviewStatus === 'NEW'
                           ? ''
-                          : 'green'
-                        : 'yellow'
+                          : 'yellow'
+                        : 'green'
                     ]"
                   >
                     <span
@@ -261,7 +261,7 @@
                       >{{
                         item.carReviewStatus !== 'FINISH'
                           ? '(共耗时'
-                          : '已耗时('
+                          : '(已耗时'
                       }}{{ getHourDiff(item.carTaskBeginTime) }})</span
                     >
                   </div>
@@ -276,8 +276,8 @@
                       item.carTestStatus !== 'FINISH'
                         ? item.carTestStatus == 'NEW'
                           ? ''
-                          : 'green'
-                        : 'yellow'
+                          : 'yellow'
+                        : 'green'
                     ]"
                   >
                     <span
@@ -291,7 +291,7 @@
                     >
                     <span v-if="item.carTestStatus !== 'NEW'"
                       >{{
-                        item.carTestStatus !== 'FINISH' ? '(共耗时' : '已耗时('
+                        item.carTestStatus !== 'FINISH' ? '(共耗时' : '(已耗时'
                       }}{{ getHourDiff(item.taskBeginTime) }})</span
                     >
                   </div>

src/views/setting/company/index.vue

@@ -73,8 +73,8 @@
       v-loading="loading"
       border
       :scroll-x="'1500px'"
-      :default-sort="{ prop: 'createTime', order: 'descending' }"
       :data="tableData"
+      @sort-change="sort_change"
     >
       <el-table-column type="index" width="55" label="序号" align="center">
       </el-table-column>
@@ -210,9 +210,17 @@ export default {
     }
   },
   created() {
+    this.queryParams.isAsc = 'desc'
+    this.queryParams.orderByColumn = 'createTime'
     this.view = this.$route.query.view
   },
   methods: {
+    sort_change(column, prop, order) {
+      this.queryParams.pageNum = 1 // 排序后返回第一页
+      this.queryParams.isAsc = order === 'ascending' ? 'asc' : 'desc'
+      this.queryParams.orderByColumn = column.prop
+      this.loadData()
+    },
     handleDelete(id) {
       this.$modal
         .confirm('是否确定删除该条数据？', {

src/views/task/confirm-result/index.vue

@@ -100,11 +100,11 @@
               </div>
             </el-col>
           </el-row>
-          <!--审查问卷概要-->
+          <!--审查表单概要-->
           <div class="form-review-questionnaire">
             <div class="title-display">
               <span class="title-i"></span>
-              <span class="title-content">审查问卷概要</span>
+              <span class="title-content">审查表单概要</span>
             </div>
             <table border="1" style="width: 100%">
               <thead>

src/views/task/on/index.vue

@@ -542,31 +542,31 @@ export default {
     this.$store.dispatch('standard/setStandardList')
   },
   methods: {
-    // loadData() {
-    //   this.loading = true
-    //   request({
-    //     url: this.listUrl,
-    //     method: 'post',
-    //     data: this.queryParams
-    //   })
-    //     .then(res => {
-    //       if (res.code === 200) {
-    //         console.log(res.rows)
-    //         // res.rows[0].carReviewStatus = 'FINISH'
-    //         res.rows[0].reviewStatus = 'SIGNED'
-    //         // res.rows[0].carReviewStatus = 'FINISH'
-    //         this.tableData = res.rows
-    //         this.total = res.total
-    //       }
-    //       this.loading = false
-    //     })
-    //     .catch(error => {
-    //       if (error.msg) {
-    //         this.$message.error(error.msg)
-    //       }
-    //       this.loading = false
-    //     })
-    // },
+    loadData() {
+      this.loading = true
+      console.log(this.queryParams)
+      if (this.queryParams.taskStatus === '0') {
+        this.queryParams.taskStatus = ''
+      }
+      request({
+        url: this.listUrl,
+        method: 'post',
+        data: this.queryParams
+      })
+        .then(res => {
+          if (res.code === 200) {
+            this.tableData = res.rows
+            this.total = res.total
+          }
+          this.loading = false
+        })
+        .catch(error => {
+          if (error.msg) {
+            this.$message.error(error.msg)
+          }
+          this.loading = false
+        })
+    },
     /**
      * 企业留档文件
      * @param item 对象