feat: 填写问卷-新增对话框、确认结果-新增按钮

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

@@ -185,13 +185,14 @@
             </el-form>
           </div>
           <!--返回按钮-->
-          <el-button
-            class="btn"
-            type="primary"
-            plain
-            @click="goToProcessedReview"
-            >返 回
-          </el-button>
+          <div class="bottom-btn">
+            <el-button type="warning" @click="goToProcessedReview">
+              返回
+            </el-button>
+            <el-button type="primary" @click="goToProcessedReview">
+              确认提交
+            </el-button>
+          </div>
         </div>
       </div>
     </page-standard>
@@ -828,4 +829,8 @@ td {
   width: 300px;
   height: 100%;
 }
+.bottom-btn {
+  display: flex;
+  justify-content: center;
+}
 </style>

src/views/task/questionnaire/index.vue

@@ -12,7 +12,7 @@
       <div class="main-content">
         <div class="prompt-message">
           <span>问卷填写情况：共10条审查细则，已完成1条，未完成9条</span>
-          <span class="center-text">有 3 条场景变更待处理</span>
+          <!--          <span class="center-text">有 3 条场景变更待处理</span>-->
           <el-checkbox v-model="checked">仅显示未完成条目</el-checkbox>
         </div>
         <el-row>
@@ -58,6 +58,9 @@
                 >
               </el-form-item>
               <el-form-item label="符合场景">
+                <el-button type="warning" @click="handleAddScene">
+                  新增场景
+                </el-button>
                 <div class="match-scene">
                   <el-checkbox v-model="checked">
                     1.管理制度发布会红头文件
@@ -224,6 +227,85 @@
         <el-button type="primary">提交问卷</el-button>
       </div>
     </el-card>
+    <!--  新增场景对话框  -->
+    <el-dialog
+      title="新增场景对话框"
+      :visible.sync="senceDialogVisible"
+      width="30%"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="handleSceneClose"
+    >
+      <div class="file-prompt">
+        <div>
+          <i
+            class="el-icon-info"
+          />新增场景，需要组织评审，评审通过后新增场景自动进入场景库。
+        </div>
+      </div>
+      <el-form
+        ref="sceneForm"
+        :model="sceneForm"
+        :rules="sceneRules"
+        label-width="80px"
+        class="scene-form"
+      >
+        <el-form-item label="评审类型" prop="reviewType">
+          <!--  下拉框  -->
+          <el-select
+            v-model="sceneForm.reviewType"
+            placeholder="请选择评审类型"
+          >
+            <el-option
+              v-for="item in reviewTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="场景分类" prop="sceneClassification">
+          <el-select
+            v-model="sceneForm.sceneClassification"
+            placeholder="请选择评审类型"
+          >
+            <el-option
+              v-for="item in reviewTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="场景内容" prop="sceneContent">
+          <el-input
+            v-model="sceneForm.sceneContent"
+            maxlength="100"
+            show-word-limit
+            type="textarea"
+          />
+        </el-form-item>
+        <el-form-item label="评审人员" prop="assessor">
+          <div>组长-xxx</div>
+          <div>组员-xxx、xxx、xxx</div>
+        </el-form-item>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input
+            v-model="sceneForm.remark"
+            maxlength="100"
+            show-word-limit
+            type="textarea"
+          />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="senceDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handleSaveNewScene">
+          确 定
+        </el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -232,6 +314,8 @@ export default {
   dicts: ['file_status'],
   data() {
     return {
+      sceneForm: {},
+      senceDialogVisible: false,
       form: {},
       checked: false,
       circleList: [
@@ -272,6 +356,17 @@ export default {
           { required: true, message: '请选择文件照片', trigger: 'change' }
         ]
       },
+      sceneRules: {
+        reviewType: [
+          { required: true, message: '请选择评审类型', trigger: 'change' }
+        ],
+        sceneClassification: [
+          { required: true, message: '请选择场景分类', trigger: 'change' }
+        ],
+        sceneContent: [
+          { required: true, message: '请输入场景内容', trigger: 'blur' }
+        ]
+      },
       // TODO 删除
       checkedTwo: false,
       checkedThree: false,
@@ -285,7 +380,8 @@ export default {
         filePicture: '',
         storageLocation: ''
       },
-      value1: ''
+      value1: '',
+      reviewTypeOptions: []
     }
   },
   methods: {
@@ -303,6 +399,16 @@ export default {
     handleBack() {
       this.$router.go(-1)
     },
+    // 新增场景
+    handleAddScene() {
+      this.senceDialogVisible = true
+      console.log('a')
+    },
+    // 新增场景对话框关闭时触发的回调函数
+    handleSceneClose() {
+      this.senceDialogVisible = false
+      this.$refs.sceneForm.resetFields()
+    },
     handleSaveFile() {
       // vue表单校验
       this.$refs.fileRef.validate(valid => {
@@ -310,6 +416,14 @@ export default {
           console.log('ddd')
         }
       })
+    },
+    handleSaveNewScene() {
+      // vue表单校验vue表单校验
+      this.$refs.sceneForm.validate(valid => {
+        if (valid) {
+          console.log('ddd')
+        }
+      })
     }
   }
 }
@@ -397,7 +511,7 @@ export default {
         .file-prompt {
           margin: 10px 0 10px 0;
           background-color: #ebf5ff;
-          span {
+          div {
             padding-left: 10px;
             i {
               color: #409eff;
@@ -413,4 +527,16 @@ export default {
     }
   }
 }
+.file-prompt {
+  margin: 10px 0 10px 0;
+  padding: 10px;
+  background-color: #ebf5ff;
+  div {
+    padding-left: 10px;
+    i {
+      color: #409eff;
+      margin-right: 10px;
+    }
+  }
+}
 </style>