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

src/views/review/wait/index.vue

@@ -158,6 +158,7 @@
         :title="handOverDialog.title"
       >
         <el-form
+          ref="handOverForm"
           :model="handOverDialog.form"
           :rules="handOverDialog.formControl.rules"
         >
@@ -179,7 +180,7 @@
         </el-form>
         <div slot="footer">
           <el-button @click="handleClose()"> 取消</el-button>
-          <el-button type="primary" @click="handleSave()"> 保存</el-button>
+          <el-button type="primary" @click="handleSave()"> 确定</el-button>
         </div>
       </el-dialog>
     </page-standard>
@@ -293,17 +294,33 @@ export default {
   },
   methods: {
     /* 关闭移交弹窗-保存*/
-    handleSave() {
-      if (this.handOverDialog.form.receivingPersonnel) {
-        this.handOverDialog.visible = false
-      } else {
-        this.$message.error('请选择接收人员')
-      }
-    },
-    /* 关闭移交弹窗-取消*/
     handleClose() {
       this.handOverDialog.visible = false
     },
+    handleSave() {
+      this.$refs.handOverForm.validate(valid => {
+        if (valid) {
+          // 表单校验通过，弹出二次确认对话框
+          this.$confirm('是否确认移交此条数据?', '移交', {
+            confirmButtonText: '确定',
+            concelButtonText: '取消',
+            type: 'warning',
+            customClass: 'box-logout',
+            cancelButtonClass: 'resetBtn',
+            closeOnClickModal: false,
+            confirmButtonClass: 'queryBtn'
+          }).then(() => {
+            /* 二次弹窗确定后*/
+            this.handOverDialog.visible = false
+            console.log('关闭人员弹窗')
+          })
+        } else {
+          // 表单校验未通过，显示错误消息
+          this.$message.error('请选择接收人员')
+          console.log('请选择接收人员')
+        }
+      })
+    },
     /* 去评审按钮页面跳转*/
     handleReview() {
       this.$router.push({ path: '/review/sceneReview' })

src/views/task/task-detail/index.vue

@@ -189,15 +189,6 @@
             </template>
           </el-table-column>
         </el-table>
-        <!-- 添加小组成员 -->
-        <!--        <el-button
-                  class="add-number"
-                  icon="el-icon-circle-plus-outline"
-                  @click="handleAddNumber"
-                >添加小组成员
-                </el-button
-                >-->
-
         <div class="subtitle" style="margin-top: 20px">报告信息</div>
         <el-row style="display: flex">
           <el-row :gutter="20">
@@ -331,7 +322,7 @@ export default {
   dicts: ['sys_task_status', 'sys_pro'],
   data() {
     return {
-      image: require('@/assets/images/login-background.jpg'),
+      image: require('@/assets/images/questionnaire/xizeshu.png'),
       formDisabled: true,
       formType: 1,
       /* 表单对象*/