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

src/assets/styles/process.scss

@@ -717,3 +717,7 @@
 .el-progress{
   display: flex;
 }
+.empty-message{
+  text-align: center;
+  margin: 0 10px;
+}

src/views/index.vue

@@ -186,7 +186,10 @@
                       {{ item.standard }}
                     </div>
                   </div>
-                  <AverageTest :value="item.value"></AverageTest>
+                  <AverageTest
+                    v-if="averageTestShow"
+                    :value="item.value"
+                  ></AverageTest>
                   <div
                     style="color: #606266; font-size: 16px; text-align: center"
                   >
@@ -248,6 +251,7 @@ export default {
   },
   data() {
     return {
+      averageTestShow: false,
       averageTestList: [
         {
           name: '汽车信息安全管理体系要求',
@@ -279,6 +283,11 @@ export default {
       ]
     }
   },
+  created() {
+    this.$nextTick(() => {
+      this.averageTestShow = true
+    })
+  },
   methods: {
     format(percentage) {
       return (percentage = `${percentage}个`)

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

@@ -289,6 +289,7 @@
             返回
           </footer-button>
           <footer-button
+            v-if="model.carReviewTask.leaderId == userId"
             type="primary"
             icon="hard-disk-one"
             @click="goToProcessedReview"
@@ -306,6 +307,7 @@ import { checkTaskDetail, carTaskSubmit, getBySubtaskId } from '@/api/task/task'
 import collapse from '@/components/Collapse/collapse'
 import collapseItem from '@/components/Collapse/collapse-item'
 import routerMixins from '@/mixins/router'
+import { mapGetters } from 'vuex'
 export default {
   components: {
     collapse: collapse,
@@ -366,6 +368,9 @@ export default {
       loading: false
     }
   },
+  computed: {
+    ...mapGetters(['userId'])
+  },
   async mounted() {
     if (this.$route.query.id) {
       this.taskId = this.$route.query.id

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

@@ -65,10 +65,16 @@
           <div class="checked-noUse">
             <el-checkbox v-model="checked">仅显示未完成页面</el-checkbox>
           </div>
+          <div v-if="detailsList.length">
             <div class="btn-tool">
               <!-- 左边按钮 -->
               <div class="btn" @click="scrollLeft">
-              <icon-park type="left" theme="outline" size="32" fill="#999999" />
+                <icon-park
+                  type="left"
+                  theme="outline"
+                  size="32"
+                  fill="#999999"
+                />
               </div>
               <!-- 中间列表 -->
               <div id="list-box" class="center-content">
@@ -259,6 +265,8 @@
               </el-form>
             </div>
           </div>
+          <div v-else class="empty-message">-暂无未完成条目-</div>
+        </div>
         <div class="bottom-btn">
           <footer-button
             v-if="detailsList.length"
@@ -682,14 +690,23 @@ export default {
       })
     },
     /**
-     *确认体系审查
+     *确认车型审查
      */
     submitFrom() {
+      this.$modal
+        .confirm('是否确认提交表单，提交后不可修改', {
+          type: 'warning',
+          title: '提示',
+          closeOnClickModal: false
+        })
+        .then(async () => {
           carReviewTaskConfirm({
             taskId: this.taskId
           }).then(res => {
             this.$router.go(-1)
           })
+        })
+        .catch(() => {})
     },
     /**
      *确认细则内容变更

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

@@ -269,6 +269,7 @@
             返回
           </footer-button>
           <footer-button
+            v-if="model.systemReviewTask.leaderId == userId"
             type="primary"
             icon="hard-disk-one"
             @click="goToProcessedReview"
@@ -286,6 +287,7 @@ import { reviewTaskDetail, taskSubmit, getBySubtaskId } from '@/api/task/task'
 import collapse from '@/components/Collapse/collapse'
 import collapseItem from '@/components/Collapse/collapse-item'
 import routerMixins from '@/mixins/router'
+import { mapGetters } from 'vuex'
 export default {
   components: {
     collapse: collapse,
@@ -320,6 +322,9 @@ export default {
       loading: false
     }
   },
+  computed: {
+    ...mapGetters(['userId'])
+  },
   async mounted() {
     if (this.$route.query.id) {
       this.taskId = this.$route.query.id

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

@@ -70,10 +70,16 @@
           <div class="checked-noUse">
             <el-checkbox v-model="checked">仅显示未完成页面</el-checkbox>
           </div>
+          <div v-if="detailsList.length">
             <div class="btn-tool">
               <!-- 左边按钮 -->
               <div class="btn" @click="scrollLeft">
-              <icon-park type="left" theme="outline" size="32" fill="#999999" />
+                <icon-park
+                  type="left"
+                  theme="outline"
+                  size="32"
+                  fill="#999999"
+                />
               </div>
               <!-- 中间列表 -->
               <div id="list-box" class="center-content">
@@ -269,6 +275,8 @@
               </el-form>
             </div>
           </div>
+          <div v-else class="empty-message">-暂无未完成条目-</div>
+        </div>
         <div class="bottom-btn">
           <footer-button
             v-if="detailsList.length"
@@ -700,6 +708,13 @@ export default {
      *确认体系审查
      */
     submitFrom() {
+      this.$modal
+        .confirm('是否确认提交表单，提交后不可修改', {
+          type: 'warning',
+          title: '提示',
+          closeOnClickModal: false
+        })
+        .then(async () => {
           reviewTaskConfirm({
             taskId: this.taskId
           }).then(res => {
@@ -708,6 +723,8 @@ export default {
               path: '/processing/unprocessed-review'
             })
           })
+        })
+        .catch(() => {})
     },
     confirmDetailChange() {
       reviewDetailsConfirm({

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

@@ -434,7 +434,6 @@ export default {
      * @param item 对象
      */
     handleRetentionFile(item) {
-      console.log(item)
       this.$router.push({
         path: '/processing/retention-file?id=' + item.id
       })
@@ -457,6 +456,13 @@ export default {
      * @param {} type 单项数据
      */
     async startTask(item) {
+      this.$modal
+        .confirm('是否确认开始？', {
+          type: 'warning',
+          title: '提示',
+          closeOnClickModal: false
+        })
+        .then(async () => {
           const res = await reviewTaskStart({
             id: item.id
           })
@@ -467,9 +473,10 @@ export default {
               this.$message.error(res.msg)
             }
           }
+        })
+        .catch(() => {})
     },
     goDetail(id) {
-      console.log(111)
       this.$router.push({
         path: '/task/task-detail?id=' + id
       })

src/views/setting/sample/taskDetails/index.vue

@@ -670,7 +670,7 @@
                 </el-col>
                 <el-col :span="8">
                   <div class="blueCard">
-                    <div>
+                    <div style="width: 100%">
                       <div class="title">送样者</div>
                       <div class="content">
                         {{ item.sampleSender ? item.sampleSender : '-' }}
@@ -682,7 +682,7 @@
               <el-row :gutter="20">
                 <el-col :span="8">
                   <div class="greenCard">
-                    <div>
+                    <div style="width: 100%">
                       <div class="title">车辆识别码</div>
                       <div class="content">
                         {{
@@ -706,7 +706,7 @@
                 </el-col>
                 <el-col :span="8">
                   <div class="blueCard">
-                    <div>
+                    <div style="width: 100%">
                       <div class="title">生产企业</div>
                       <div class="content">
                         {{
@@ -811,7 +811,7 @@
                 </el-col>
                 <el-col :span="16">
                   <div class="blueCard">
-                    <div>
+                    <div style="width: 100%">
                       <div class="title">生产企业</div>
                       <div class="content">
                         {{
@@ -1032,6 +1032,7 @@ export default {
     height: 70px;
     background: rgba(19, 190, 36, 0.1);
     border-radius: 8px;
+    width: 100%;
     .title {
       text-align: center;
       font-size: 14px;
@@ -1044,6 +1045,9 @@ export default {
       font-weight: 700;
       color: #13be24;
       text-align: center;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
   }
   .yellowCard {
@@ -1053,6 +1057,7 @@ export default {
     height: 70px;
     background: rgba(249, 171, 56, 0.1);
     border-radius: 8px;
+    width: 100%;
     .title {
       text-align: center;
       font-size: 14px;
@@ -1065,6 +1070,9 @@ export default {
       font-weight: 700;
       color: #f9ab38;
       text-align: center;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
   }
   .blueCard {
@@ -1074,6 +1082,7 @@ export default {
     height: 70px;
     background: rgba(26, 111, 215, 0.1);
     border-radius: 8px;
+    width: 100%;
     .title {
       font-size: 14px;
       font-weight: 400;
@@ -1086,6 +1095,9 @@ export default {
       font-weight: 700;
       color: #1a6fd7;
       text-align: center;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
   }
 }

src/views/system/menu/index.vue

@@ -20,6 +20,7 @@
           v-model="queryParams.status"
           placeholder="菜单状态"
           clearable
+          @change="$forceUpdate()"
         >
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
@@ -493,7 +494,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm('queryForm')
+      this.queryParams = {}
       this.handleQuery()
     },
     /** 新增按钮操作 */