2024年9月3日 新增批量新增，添加搜索条件等

.gitignore

@@ -32,3 +32,5 @@ pnpm-debug.log*
 /.vscode/
 /.history/
 /svn clear.bat
+
+nodePath.txt

changePath.bat

@@ -0,0 +1,25 @@
+@echo off & chcp 65001
+echo 原node版本
+node -v
+echo 如果运行错误请设置node版本
+if not exist nodePath.txt (
+	echo 请在项目根目录创建【nodePath.txt】文件并填写jdk路径,文件内容大致为【D:\ProgramGreeFile\nodejs\node-21.2.0】
+	pause
+	exit
+)
+set /P nodePath=<nodePath.txt
+if not defined nodePath (
+	echo 请在项目根目录创建【nodePath.txt】文件并填写jdk路径,文件内容大致为【D:\ProgramGreeFile\nodejs\node-21.2.0】
+	pause
+	exit
+)
+::还原
+::if pathBak == '' ( ) else ( set path=%pathBak% )
+if "%pathBak%"=="" (echo '跳过重置环境变量') else set path=%pathBak%
+
+set pathBak=%path%
+set path2=%nodePath%;%path%
+set path=%path2%
+echo 现node版本
+node -v
+echo 开始执行

gxdm.bat

@@ -1,5 +1,6 @@
 @echo off
 echo 更新前台代码中...
+::git.exe pull -v --progress "şËĐÄżâ"
 git.exe pull -v --progress "origin"
 echo 更新成功
 PAUSE

init.bat

@@ -1 +1,3 @@
-yarn bootstrap
+:: @echo off & chcp 65001
+call ./changePath.bat
+npm run pinstall

package.json

@@ -8,6 +8,7 @@
   },
   "scripts": {
     "bootstrap": "pnpm install",
+    "pinstall": "pnpm install",
     "serve": "npm run dev",
     "dev": "vite",
     "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite",

run.bat

@@ -1 +1,3 @@
-yarn dev --mode development
+::@echo off & chcp 65001
+call ./changePath.bat
+npm run dev

src/views/student/tCompareInfo/TCompareInfo.data.ts

@@ -40,6 +40,11 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'xq'
   },
+  {
+    title: '年级',
+    align: "center",
+    dataIndex: 'nj'
+  },
   {
     title: '身份证照片',
     align: "center",

src/views/student/tCompareInfo/TCompareInfoList.vue

@@ -34,6 +34,11 @@
               <j-input placeholder="请输入校区" v-model:value="queryParam.xq"></j-input>
             </a-form-item>
           </a-col>
+          <a-col :lg="6">
+              <a-form-item label="年级" name="nj">
+                <j-input placeholder="请输入年级" v-model:value="queryParam.nj"></j-input>
+              </a-form-item>
+            </a-col>
           <a-col :span="24">
             <a-row>
               <a-col :span="6" class="dgha">

src/views/student/tFreshman/TFreshmanList.vue

@@ -54,6 +54,11 @@
                 <j-input placeholder="请输入性别" v-model:value="queryParam.xb"></j-input>
               </a-form-item>
             </a-col>
+            <a-col :lg="6">
+              <a-form-item label="年级" name="nj">
+                <j-input placeholder="请输入年级" v-model:value="queryParam.nj"></j-input>
+              </a-form-item>
+            </a-col>
           <a-col :span="24">
             <span class="table-page-search-submitButtons">
               <a-col :span="24" style="text-align: center;">
@@ -118,7 +123,7 @@
   import { downloadFile } from '/@/utils/common/renderUtils';
   import TFreshmanModal from './components/TFreshmanModal.vue'
   import { useMethods } from '/@/hooks/system/useMethods';
-import { filterObj } from '/@/utils/common/compUtils';
+  import { filterObj } from '/@/utils/common/compUtils';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import {JInput } from '/@/components/Form';
 

src/views/student/tFreshmanException/TFreshmanExceptionList.vue

@@ -39,6 +39,11 @@
                 <j-input placeholder="请输入校区" v-model:value="queryParam.xq"></j-input>
               </a-form-item>
             </a-col>
+            <a-col :lg="6">
+              <a-form-item label="年级" name="nj">
+                <j-input placeholder="请输入年级" v-model:value="queryParam.nj"></j-input>
+              </a-form-item>
+            </a-col>
           <a-col :span="24">
             <span class="table-page-search-submitButtons">
               <a-col :span="24" style="text-align: center;">

src/views/student/tGkPicinfo/TGkPicinfoList.vue

@@ -29,6 +29,11 @@
                 <j-input placeholder="请输入专业名称" v-model:value="queryParam.zymc"></j-input>
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item label="年级" name="nj">
+                <j-input placeholder="请输入年级" v-model:value="queryParam.nj"></j-input>
+              </a-form-item>
+            </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">

src/views/student/tSfzPicinfo/TSfzPicinfo.data.ts

@@ -56,11 +56,11 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'endYxq'
   },
-  // {
+  {
-  //   title: '年级',
+    title: '年级',
-  //   align: "center",
+    align: "center",
-  //   dataIndex: 'nj'
+    dataIndex: 'nj'
-  // },
+  },
   {
     title: '是否有效',
     align: "center",

src/views/student/tSfzPicinfo/TSfzPicinfoList.vue

@@ -14,6 +14,11 @@
               <j-input placeholder="请输入身份证号" v-model:value="queryParam.sfzh"></j-input>
             </a-form-item>
           </a-col>
+          <a-col :lg="8">
+              <a-form-item label="年级" name="nj">
+                <j-input placeholder="请输入年级" v-model:value="queryParam.nj"></j-input>
+              </a-form-item>
+            </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
@@ -40,6 +45,7 @@
         <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> -->
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined">新增</a-button>
         <a-button type="primary" @click="handleAllAdd" preIcon="ant-design:plus-outlined">批量新增</a-button>
+        <a-button type="primary" @click="handleAllBatchAdd" preIcon="ant-design:plus-outlined">自动批量新增</a-button>
         <a-button type="primary" @click="handleGATAdd" preIcon="ant-design:plus-outlined">港澳台新增</a-button>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="downloadDrive">下载驱动</a-button>
@@ -89,6 +95,7 @@
     <TSfzPicinfoModal ref="registerModal" @success="handleSuccess"></TSfzPicinfoModal>
     <TSfzPicinfoAllModal ref="registerAllModal" @success="handleSuccess"></TSfzPicinfoAllModal>
     <TSfzPicinfoGATModal ref="registerGATModal" @success="handleSuccess"></TSfzPicinfoGATModal>
+    <TSfzPicinfoAllBatchModal ref="registerAllBatchModal" @success="handleSuccess"></TSfzPicinfoAllBatchModal>
   </div>
 </template>
 
@@ -104,6 +111,7 @@
   import TSfzPicinfoModal from './components/TSfzPicinfoModal.vue'
   import TSfzPicinfoAllModal from './components/TSfzPicinfoAllModal.vue'
   import TSfzPicinfoGATModal from './components/TSfzPicinfoGATModal.vue'
+  import TSfzPicinfoAllBatchModal from './components/TSfzPicinfoAllBatchModal.vue'
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
@@ -118,6 +126,7 @@
   const registerModal = ref();
   const registerAllModal = ref();
   const registerGATModal = ref();
+  const registerAllBatchModal = ref();
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
@@ -174,7 +183,6 @@
     registerModal.value.add();
   }
 
-
   /**
    * 新增事件
    */
@@ -191,6 +199,14 @@
     registerGATModal.value.add();
   }
 
+  /**
+   * 新增事件
+   */
+   function handleAllBatchAdd() {
+    registerAllBatchModal.value.disableSubmit = false;
+    registerAllBatchModal.value.add();
+  }
+
   /**
    * 编辑事件
    */

src/views/student/tSfzPicinfo/components/TSfzPicinfoAllBatchModal.vue

@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <TSfzPicinfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></TSfzPicinfoForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import TSfzPicinfoForm from './TSfzPicinfoAllBatchForm.vue'
+
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>

src/views/student/tSfzPicinfo/components/TSfzPicinfoAllForm.vue

@@ -113,6 +113,7 @@
   import { Form } from 'ant-design-vue';
   import { getIdCardAllInfo, idCardConvert } from '/@/utils/idCardUtil';
   import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  import { getCurrentSchoolYear } from '/@/views/student/common/commonConfig';
 
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
@@ -165,6 +166,12 @@
     return props.formDisabled;
   });
 
+  const currentSchoolYear = ref<string>('');
+  //获取当前学期学年
+  getCurrentSchoolYear().then(res => {
+    let paramDate = res;
+    currentSchoolYear.value = paramDate?.paramValue;;
+  })
 
   /**
    * 新增
@@ -290,6 +297,7 @@
         formData.startYxq = data.IssuedData;//有效期限（开始日期）
         formData.endYxq = data.ValidDate;//有效期限（结束日期）
         //formData.sfzflag = data.Nation;//是否有效：0-有效 1-无效 无效：照片不存在 有效：照片存在并且以身份证命名或者通过学号已经清洗成以身份证命名
+        formData.nj = currentSchoolYear.value;
       }else{
         createMessage[data.type](data.message)
         resetFields();

src/views/student/tSfzPicinfo/components/TSfzPicinfoForm.vue

@@ -112,6 +112,7 @@
   import { Form } from 'ant-design-vue';
   import { getIdCardAllInfo, idCardConvert } from '/@/utils/idCardUtil';
   import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  import { getCurrentSchoolYear } from '/@/views/student/common/commonConfig';
 
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
@@ -164,6 +165,12 @@
     return props.formDisabled;
   });
 
+  const currentSchoolYear = ref<string>('');
+  //获取当前学期学年
+  getCurrentSchoolYear().then(res => {
+    let paramDate = res;
+    currentSchoolYear.value = paramDate?.paramValue;;
+  })
 
   /**
    * 新增
@@ -249,6 +256,7 @@
         formData.startYxq = data.IssuedData;//有效期限（开始日期）
         formData.endYxq = data.ValidDate;//有效期限（结束日期）
         //formData.sfzflag = data.Nation;//是否有效：0-有效 1-无效 无效：照片不存在 有效：照片存在并且以身份证命名或者通过学号已经清洗成以身份证命名
+        formData.nj = currentSchoolYear.value;
       }else{
         createMessage[data.type](data.message)
         resetFields();

src/views/student/tSfzPicinfo/components/TSfzPicinfoGATForm.vue

@@ -93,6 +93,7 @@
   import { Form } from 'ant-design-vue';
   import { getIdCardAllInfo, idCardConvert } from '/@/utils/idCardUtil';
   import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  import { getCurrentSchoolYear } from '/@/views/student/common/commonConfig';
 
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
@@ -145,6 +146,12 @@
     return props.formDisabled;
   });
 
+  const currentSchoolYear = ref<string>('');
+  //获取当前学期学年
+  getCurrentSchoolYear().then(res => {
+    let paramDate = res;
+    currentSchoolYear.value = paramDate?.paramValue;;
+  })
 
   /**
    * 新增
@@ -226,6 +233,7 @@
         formData.startYxq = data.IssuedData;//有效期限（开始日期）
         formData.endYxq = data.ValidDate;//有效期限（结束日期）
         //formData.sfzflag = data.Nation;//是否有效：0-有效 1-无效 无效：照片不存在 有效：照片存在并且以身份证命名或者通过学号已经清洗成以身份证命名
+        formData.nj = currentSchoolYear.value;
       }else{
         createMessage[data.type](data.message)
         resetFields();

src/views/student/tXjPicinfo/TXjPicinfoList.vue

@@ -29,6 +29,11 @@
                 <j-input placeholder="请输入专业名称" v-model:value="queryParam.zymc"></j-input>
               </a-form-item>
             </a-col>
+            <a-col :lg="6">
+              <a-form-item label="年级" name="nj">
+                <j-input placeholder="请输入年级" v-model:value="queryParam.nj"></j-input>
+              </a-form-item>
+            </a-col>
             <a-col :lg="6">
             <span class="table-page-search-submitButtons">
               <a-col :lg="6" style="text-align: center;">

tbdm.bat

@@ -0,0 +1,3 @@
+@echo off
+TortoiseGitProc  /command:sync /path:"./" /seq:0 /hwnd:0000000000390AF0	x64	TortoiseGitProc.exe
+exit