Merge projectA into B with conflict resolution

src/views/workflows/leave/leaveEdit.vue

@@ -12,7 +12,14 @@
       />
     </el-card>
     <el-card shadow="never" style="height: 78vh; overflow-y: auto">
-      <el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view'" :model="form" :rules="rules" label-width="80px">
+      <el-form
+        ref="leaveFormRef"
+        v-loading="loading"
+        :disabled="routeParams.type === 'view' || form.status == 'waiting'"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+      >
         <el-form-item label="请假类型" prop="leaveType">
           <el-select v-model="form.leaveType" placeholder="请选择请假类型" style="width: 100%">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />