Merge remote-tracking branch 'origin/developer' into developer

src/views/admin/system/dept/index.vue

@@ -128,3 +128,8 @@ const resetQuery = () => {
 	queryRef.value.resetFields();
 };
 </script>
+<style scoped>
+:deep(.el-table__body tr td) {
+  text-align: left !important;
+}
+</style>

src/views/recruit/recruitstudentsignup/detaiform.vue

@@ -671,8 +671,9 @@
         <el-button @click="visible = false">取消</el-button>
         <el-button type="primary" @click="dataFormSubmit('0')" v-if="hasAuth('recruit_recruitstudentsignup_add') && canSubmit&&!dataForm.id">保存并送审</el-button>
         <el-button type="primary" @click="dataFormSubmit('0')" v-if="hasAuth('recruit_recruitstudentsignup_edit') && canSubmit&&dataForm.id">保存</el-button>
-        <el-button type="success" icon="CircleCheck" @click="dataFormSubmit('20')" v-if="hasAuth('signup_info_exam') && canSubmit&&dataForm.id">确认录取</el-button>
+        <el-button type="success" icon="CircleCheck" @click="dataFormSubmit('20',false)" v-if="hasAuth('signup_info_exam') && canSubmit&&dataForm.id">确认录取</el-button>
-        <el-button type="danger" icon="CircleClose" @click="dataFormSubmit('-20')" v-if="hasAuth('signup_info_exam') && canSubmit&&dataForm.id">驳回录取</el-button>
+        <el-button type="warning" icon="CircleCheck" @click="dataFormSubmit('20',true)" v-if="hasAuth('signup_pass_force') && canSubmit&&dataForm.id">强制录取</el-button>
+        <el-button type="danger" icon="CircleClose" @click="dataFormSubmit('-20',false)" v-if="hasAuth('signup_info_exam') && canSubmit&&dataForm.id">驳回</el-button>
       </div>
     </template>
 
@@ -1493,7 +1494,7 @@ const updateTuitionByMajorAndEducation = () => {
 }
 
 // 表单提交
-const dataFormSubmit = (state: string) => {
+const dataFormSubmit = (state: string,force:any) => {
   dataForm.auditStatus = state
   let submitTitle = "确认通过该学生的报名申请么?"
   // 新增模式
@@ -1545,6 +1546,7 @@ const dataFormSubmit = (state: string) => {
       canSubmit.value = false
       if (dataForm.id) {
         // 编辑模式
+        dataForm.force=force
         putObj(dataForm).then(() => {
           message.success('操作成功')
           visible.value = false

src/views/recruit/recruitstudentsignup/majorChange.vue

@@ -102,7 +102,8 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="visible = false">取消</el-button>
-        <el-button type="primary" @click="dataFormSubmit" v-if="canSubmit">确认修改</el-button>
+        <el-button type="primary" @click="dataFormSubmit(false)" v-if="canSubmit">确认修改</el-button>
+        <el-button type="warning" @click="dataFormSubmit(true)" v-if="canSubmit" v-auth="'recruit_signup_change_force'">强制修改</el-button>
       </div>
     </template>
   </el-dialog>
@@ -272,12 +273,13 @@ const changeCM = (id: string) => {
 
 
 // 表单提交
-const dataFormSubmit = async () => {
+const dataFormSubmit = async (force:any) => {
   const titleText = "确认调整录取专业么?"
   if (dataForm.confirmedMajor == dataForm.newConfirmedMajor) {
     message.error('新专业不能和原专业相同')
     return
   }
+  dataForm.force=force
   try {
     await messageBox.confirm(titleText)
     dataFormRef.value?.validate((valid: boolean) => {

src/views/recruit/recruitstudentsignup/update.vue

@@ -183,9 +183,10 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="visible = false">取消</el-button>
-        <el-button type="primary" @click="dataFormSubmit('1')" v-if="hasAuth('recruit_recruitstudentsignup_edit') && canSubmit">保存</el-button>
+        <el-button type="primary" @click="dataFormSubmit('1',false)" v-if="hasAuth('recruit_recruitstudentsignup_edit') && canSubmit">保存</el-button>
-        <el-button type="success" icon="CircleCheck" @click="dataFormSubmit('2')" v-if="hasAuth('signup_material_exam') && canSubmit">通过</el-button>
+        <el-button type="success" icon="CircleCheck" @click="dataFormSubmit('2',false)" v-if="hasAuth('signup_material_exam') && canSubmit">通过</el-button>
-        <el-button type="danger" icon="CircleClose" @click="dataFormSubmit('3')" v-if="hasAuth('signup_material_exam') && canSubmit">驳回</el-button>
+        <el-button type="success" icon="CircleCheck" @click="dataFormSubmit('2',true)" v-if="hasAuth('signup_material_pass_force') && canSubmit">强制通过</el-button>
+        <el-button type="danger" icon="CircleClose" @click="dataFormSubmit('3',false)" v-if="hasAuth('signup_material_exam') && canSubmit">驳回</el-button>
       </div>
     </template>
 
@@ -412,13 +413,14 @@ const initData = () => {
 }
 
 // 表单提交
-const dataFormSubmit = (submitType: string) => {
+const dataFormSubmit = (submitType: string,force:any) => {
   if ((dataForm.zlshRemark == '' || !dataForm.zlshRemark) && submitType == '3') {
     message.error('请填写驳回理由')
     return
   }
   dataForm.zlsh = submitType
   canSubmit.value = false
+  dataForm.force=force
   materialExam(dataForm).then(() => {
     message.success('操作成功')
     visible.value = false

src/views/recruit/recruitstudentsignupturnover/index.vue

@@ -201,7 +201,8 @@
         <template #footer>
           <div class="dialog-footer">
             <el-button @click="cancelPlace">取消</el-button>
-            <el-button type="primary" @click="update">保存</el-button>          
+            <el-button type="primary" @click="update(false)">保存</el-button>
+            <el-button type="warning" @click="update(true)" v-auth="'recruit_signup_change_force'">强制保存</el-button>
           </div>
         </template>
       </el-dialog>
@@ -273,7 +274,8 @@ const exarmForm = reactive({
   isMajorChange: '',
   examRemark: '',
   groupId: '',
-  remarks: ''
+  remarks: '',
+  force:false
 })
 
 // 表单验证规则
@@ -340,11 +342,11 @@ const cancelPlace = () => {
 }
 
 // 保存审核
-const update = async () => {
+const update = async (force:any) => {
   try {
     const valid = await exarmFormRef.value?.validate().catch(() => {})
     if (!valid) return
-    
+    exarmForm.force=force
     await putObj(exarmForm)
     message.success('审核成功')
     majorChangeVisible.value = false