a

.env.development

@@ -8,4 +8,4 @@ VITE_OPEN=true
 ENV=development
 
 # ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://scj-v3.zhxy.link/api
+VITE_ADMIN_PROXY_PATH = http://localhost:9999

src/views/admin/dict/dictItem/form.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-model="visible" :title="dataForm.id ? $t('common.editBtn') : $t('common.addBtn')" width="600">
-    <el-form ref="dicDialogFormRef" :model="dataForm" label-width="90px" :rules="dataRules" v-loading="loading">
+    <el-form ref="dicDialogFormRef" :model="dataForm" label-width="120px" :rules="dataRules" v-loading="loading">
       <el-form-item :label="$t('dictItem.dictType')" prop="dictType">
         <el-input v-model="dataForm.dictType" clearable disabled
                   :placeholder="$t('dictItem.inputDictTypeTip')"></el-input>
@@ -22,6 +22,10 @@
         <el-input type="textarea" maxlength="100" :rows="3" v-model="dataForm.remarks"
                   :placeholder="$t('dictItem.inputRemarksTip')"></el-input>
       </el-form-item>
+      <el-form-item label="状态颜色" prop="fontCss">
+        <el-input maxlength="100" v-model="dataForm.fontCss"
+                  placeholder="状态颜色"></el-input>
+      </el-form-item>
     </el-form>
     <template #footer>
 			<span class="dialog-footer">
@@ -57,6 +61,7 @@ const dataForm = reactive({
   description: '',
   sortOrder: 0,
   remarks: '',
+  fontCss: '',
 });
 
 const dataRules = reactive({

src/views/professional/academicqualificationsconfig/index.vue

@@ -12,7 +12,6 @@
           </el-button>
         </div>
       </el-row>
-
       <!-- 表格 -->
       <el-table
         ref="tableRef"

src/views/recruit/recruitstudentsignup/DelayPayTimeDialog.vue

@@ -21,7 +21,7 @@
 <script>
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { updateInfo } from '/@/api/recruit/recruitstudentsignup'
+// import { updateInfo } from '/@/api/recruit/recruitstudentsignup'
 
 export default {
   name: 'DelayPayTimeDialog',
@@ -41,19 +41,19 @@ export default {
     }
 
     const handleSave = () => {
-      ElMessageBox.confirm('是否确认进度延迟收费操作？请谨慎操作', '提示', {
+      // ElMessageBox.confirm('是否确认进度延迟收费操作？请谨慎操作', '提示', {
-        confirmButtonText: '确定',
+      //   confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      //   cancelButtonText: '取消',
-        type: 'warning'
+      //   type: 'warning'
-      }).then(() => {
+      // }).then(() => {
-        return updateInfo({ delayPaymentTime: delayPayTime.value, id: currentId.value })
+      //   return updateInfo({ delayPaymentTime: delayPayTime.value, id: currentId.value })
-      }).then(() => {
+      // }).then(() => {
-        visible.value = false
+      //   visible.value = false
-        ElMessage.success('延迟收费修改成功')
+      //   ElMessage.success('延迟收费修改成功')
-        emit('refresh')
+      //   emit('refresh')
-      }).catch(() => {
+      // }).catch(() => {
-        // 用户取消操作
+      //   // 用户取消操作
-      })
+      // })
     }
 
     const handleClose = () => {

src/views/recruit/recruitstudentsignup/detaiform.vue

@@ -639,8 +639,11 @@
     <template #footer v-if="type==1">
       <div class="dialog-footer">
         <el-button @click="visible = false">取消</el-button>
-        <el-button type="primary" @click="dataFormSubmit(20)" v-if="canSubmit">确认录取</el-button>
+        <el-button type="primary" @click="dataFormSubmit(20)" v-auth="'recruit_recruitstudentsignup_add'"  v-if="canSubmit&&!dataForm.id">保存并送审</el-button>
-        <el-button type="danger" plain @click="dataFormSubmit(-20)" v-if="canSubmit">驳回录取</el-button>
+
+        <el-button type="primary" @click="dataFormSubmit" v-auth="'signup_info_exam'"  v-if="canSubmit&&dataForm.id">保存</el-button>
+        <el-button type="primary" @click="dataFormSubmit('20')" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">确认录取</el-button>
+        <el-button type="danger" plain @click="dataFormSubmit('-20')" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">驳回录取</el-button>
       </div>
     </template>
 
@@ -1310,20 +1313,23 @@ const changeM = (id: string) => {
 }
 
 // 表单提交
-const dataFormSubmit = (state: number) => {
+const dataFormSubmit = (state: string) => {
-  dataForm.auditStatus = String(state)
+  dataForm.auditStatus = state
   let submitTitle = "确认通过该学生的报名申请么?"
-  if (state == -20) {
+  if(state){
-    submitTitle = "确认驳回该学生的报名申请么？"
+    if (state == "-20") {
-  } else {
+      submitTitle = "确认驳回该学生的报名申请么？"
-    if (!dataForm.confirmedMajor) {
+    } else {
-      ElNotification.error({
+      if (!dataForm.confirmedMajor) {
-        title: '错误',
+        ElNotification.error({
-        message: '请选择录取专业'
+          title: '错误',
-      })
+          message: '请选择录取专业'
-      return
+        })
+        return
+      }
     }
   }
+
   if (dataForm.degreeOfEducation == '1' && (dataForm.score == undefined || dataForm.score == '')) {
     ElNotification.error({
       title: '错误',

src/views/recruit/recruitstudentsignup/index.vue

@@ -11,7 +11,7 @@
         <template #default="{ visible }">
           <template v-if="visible">
         <el-form-item label="招生计划" prop="groupId">
-              <el-select v-model="dataForm.groupId" filterable clearable placeholder="请选择招生计划" @change="chanMajor">
+              <el-select v-model="dataForm.groupId" filterable clearable placeholder="请选择招生计划" >
             <el-option
               v-for="item in planList"
               :key="item.id"
@@ -1125,12 +1125,12 @@ const handlePushCity = (id: string) => {
 
 // 重新推送
 const handleRePush = (row: any) => {
-  messageBox.confirm('是否确认重新推送本条数据？请谨慎操作').then(() => {
+  // messageBox.confirm('是否确认重新推送本条数据？请谨慎操作').then(() => {
-    return rePushApi({ id: row.id })
+  //   return rePushApi({ id: row.id })
-  }).then(() => {
+  // }).then(() => {
-    message.success('推送成功')
+  //   message.success('推送成功')
-    getDataList()
+  //   getDataList()
-      })
+  //     })
 }
 
 // 延迟缴费
@@ -1277,7 +1277,6 @@ const init = async () => {
     if (planList.value.length > 0) {
       dataForm.groupId = planList.value[0].id
       getDataList()
-      chanMajor()
     }
   })
   

src/views/recruit/recruitstudentsignup/indexClass.vue

@@ -395,6 +395,13 @@ import axios from 'axios'
 import { getList } from '/@/api/recruit/recruitstudentplangroup'
 import {
   classPage,
+
+  leaveSchool,
+  rePush,
+  // updateInfo,
+  yjOut,
+  toWord,
+  sureLQTZ,
   tbStuWork,
   oneClass,
   oneStuNo,
@@ -701,6 +708,151 @@ const resetForm = (formName: string) => {
     formRef.value?.resetFields()
   }
 }
+<<<<<<< HEAD
+=======
+// 使用插槽  缴费状态
+const getStatus = (type: string) => {
+  if (type == '0') {
+    return '未缴费'
+  } else if (type == '5') {
+    return '部分缴费'
+  } else if (type == '10') {
+    return '已缴费'
+  }
+  return ''
+}
+
+const getPushed = (type: string) => {
+  if (type == '0') {
+    return '未推送'
+  } else if (type == '1') {
+    return '已推送'
+  }
+  return ''
+}
+
+const getMajor = (type: string) => {
+  if (type == '0') {
+    return '未申请'
+  } else if (type == '1') {
+    return '待审核'
+  } else if (type == '2') {
+    return '驳回'
+  } else if (type == '3') {
+    return '已通过'
+  }
+  return ''
+}
+
+const lqtz = (row: any) => {
+  id.value = row.id
+  pdfPath.value = ""
+  if (row.isBackTz == '0') {
+    lqtzsShow.value = true
+  } else {
+    lqtzsShow.value = false
+  }
+  toWord(row).then((res: any) => {
+    pdfPath.value = "/recruit/file/previewPdf?filePath=" + encodeURIComponent(res.data)
+    lqtzsVisible.value = true
+  })
+}
+
+const infoTable = (row: any) => {
+  window.open("printRecruitedStu.html?appId=" + row.id)
+}
+
+const suerLQTZ = () => {
+  useMessageBox().confirm('是否确认已打印本通知书？请谨慎操作').then(() => {
+    return sureLQTZ({ id: id.value })
+  }).then(() => {
+    message.success('保存成功')
+    lqtzsVisible.value = false
+    getDataList()
+  })
+}
+
+const rePushHandle = (row: any) => {
+  useMessageBox().confirm('是否确认重新推送本条数据？请谨慎操作').then(() => {
+    return rePush({ id: row.id })
+  }).then(() => {
+    message.success('推送成功')
+    getDataList()
+  })
+}
+
+const delayPayTimeSet = (row: any) => {
+  delayPayTime.value = ''
+  id.value = row.id
+  if (row.delayPaymentTime) {
+    delayPayTime.value = row.delayPaymentTime
+  }
+  delayPayTimeVisible.value = true
+}
+
+const updateInfoHandle = () => {
+  // useMessageBox().confirm('是否确认进度延迟收费操作？请谨慎操作').then(() => {
+  //   return updateInfo({ delayPaymentTime: delayPayTime.value, id: id.value })
+  // }).then(() => {
+  //   delayPayTimeVisible.value = false
+  //   message.success('延迟收费修改成功')
+  //   getDataList()
+  // })
+}
+
+const updateFS = () => {
+  updateFs({ "serialNumber": tableData.value[0].serialNumber.substring(1, tableData.value[0].serialNumber.length) }).then(() => {
+    ElNotification.success({
+      title: '成功',
+      message: '已提交查询请求，请等待1分钟后重新查询'
+    })
+    dialogFormVisible.value = false
+    getDataList()
+  })
+}
+
+const showPayCode = (row: any) => {
+  showPrise1.value = false
+  showPrise2.value = false
+  showPrise3.value = false
+
+  // 置空
+  payQrcode1.value = ""
+  payQrcode2.value = ""
+  payQrcode3.value = ""
+
+  if (row.clfPayCode == "" || row.clfPayCode == undefined) {
+    payQrcode1Msg.value = ""
+    showPrise1.value = false
+  } else {
+    payQrcode1Msg.value = "材料费、代办费"
+    showPrise1.value = true
+    payQrcode1.value = 'https://jscz.govpay.ccb.com/online/fsjf?PyF_BillNo=' + row.clfPayCode + '&Verf_CD=blank&Admn_Rgon_Cd=320400'
+  }
+
+  if (row.xfPayCode == "" || row.xfPayCode == undefined) {
+    payQrcode2Msg.value = ""
+    showPrise2.value = false
+  } else {
+    payQrcode2Msg.value = "学费"
+    showPrise2.value = true
+    payQrcode2.value = 'https://jscz.govpay.ccb.com/online/fsjf?PyF_BillNo=' + row.xfPayCode + '&Verf_CD=blank&Admn_Rgon_Cd=320400'
+  }
+
+  if (row.zdbPayCode == "" || row.zdbPayCode == undefined) {
+    payQrcode3Msg.value = ""
+    showPrise3.value = false
+  } else {
+    payQrcode3Msg.value = "中德班学费"
+    showPrise3.value = true
+    payQrcode3.value = 'https://jscz.govpay.ccb.com/online/fsjf?PyF_BillNo=' + row.zdbPayCode + '&Verf_CD=blank&Admn_Rgon_Cd=320400'
+  }
+
+  tableData.value = []
+  tableData.value.push(row)
+  dialogFormVisible.value = true
+}
+>>>>>>> be196ec8efc2c233093a278ab03451f67a7e8c2e
 
 // 初始化
 onMounted(() => {