代码合并

src/views/components/DialogForm/index.vue

@@ -17,7 +17,8 @@
                         :placeholder="'请输入' + item.label" clearable :disabled="disables[item.prop]" />
                 </el-form-item>
 
-                <el-form-item :label="item.label" v-if="item.type === 'radio' && item.options" :prop="item.prop"
+                <el-form-item :label="item.label" v-if="item.type === 'radio' && item.options" 
+                    :prop="item.prop"
                     :rules="item.rules">
                     <el-radio-group v-model="form[item.prop]" :disabled="disables[item.prop]">
                         <el-radio v-for="dict in item.options" :key="dict.value" :value="dict.value">{{ dict.label
@@ -144,7 +145,6 @@ const formStatus = ref('form') //form：表单 details:详情
 
 const getImages = (key) => {
    
-    console.log(233, key);
     if(typeof key === 'object'){
       return key.map(item =>{
             return  form.value[item]

src/views/staff/volunteer/manage/index.vue

@@ -235,6 +235,9 @@ const dialogData = reactive({
             label: '驳回原因',
             prop: 'rejectReason',
             type: 'textarea',
+            rules: [
+                { required: true, message: '请填写驳回原因', trigger: 'blur' }
+            ],
             show: (form) => {
                 console.log('驳回原因', form);
                 return form.appStatus === '3'
@@ -273,7 +276,7 @@ const openDialog = (data, type) => {
         if (type) {
             //审核
             title.value = '审核'
-
+            row.appStatus = '';
         } else {
             disabledData['appStatus'] = true;
             disabledData['rejectReason'] = true;
@@ -304,6 +307,8 @@ const submitForm = async (parmas) => {
             })
             if (res.code === 200) {
                 proxy.$modal.msgSuccess("审核成功");
+                userTableRef.value.resetForm();
+                dialogFormRef.value.handleDialog(false);
                 return;
             }
             proxy.$modal.msgSuccess(res.msg);
@@ -311,9 +316,6 @@ const submitForm = async (parmas) => {
     } catch (error) {
         console.log('error', error);
 
-    } finally {
-        userTableRef.value.resetForm();
-        dialogFormRef.value.handleDialog(false);
     }
 
 }