Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_pc

src/views/Home/index-new-blue.vue

@@ -963,7 +963,7 @@ export default {
     this.avatar = store.getters.avatar;
   },
   mounted() {
-    if (checkPermi(['home:stu:undo1'])) {
+    if (checkPermi(['home:stu:undo1']) && store.getters.name !== 'admin') {
       console.log("检查到学生身份，获取个人信息");
       this.getOwnInfo();
     }

src/views/comprehensive/knzzGlApply/cpnt/GlLook.vue

@@ -12,7 +12,7 @@
             <table cellspacing="0" cellpadding="0" style="border-collapse:collapse; margin:0 auto; width:469.55pt">
                 <tr style="height:25.75pt">
                     <td rowspan="6"
-                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:25.5pt">
+                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:24.65pt">
                         <p style="line-height:12pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt"> </span><span
                                 style="font-family:仿宋; font-size:12pt">     </span><span
@@ -170,7 +170,7 @@
                 </tr>
                 <tr style="height:25.95pt">
                     <td rowspan="3"
-                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:25.5pt">
+                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:24.65pt">
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">家庭经济情况</span></p>
                     </td>
@@ -292,7 +292,7 @@
                 </tr>
                 <tr style="height:16.95pt">
                     <td rowspan="2"
-                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:25.5pt">
+                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:24.65pt">
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">学习成绩</span></p>
                     </td>
@@ -355,9 +355,9 @@
                             </span><span style="font-family:仿宋; font-size:12pt">（名次/总人数）</span></p>
                     </td>
                 </tr>
-                <tr style="height:109.55pt">
+                <tr style="height:130pt">
                     <td
-                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:20.4pt">
+                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:24.65pt">
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">申请理由</span></p>
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
@@ -365,48 +365,58 @@
                     </td>
                     <td colspan="12"
                         style="position: relative; border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:426.8pt">
-                        <p style="line-height:15pt; margin:10pt 0pt 0pt; orphans:0; text-align:left; text-indent:2em; widows:0"><span
-                                style="font-family:仿宋; font-size:12pt">
-                                {{ formData.applyReason }}
-                            </span></p>
                         <p
-                            style="position: absolute;bottom: 0;right:0; line-height:15pt; margin:0pt; text-align:right; widows:0">
+                            style="line-height:15pt; margin:10pt 0pt 0pt; orphans:0; text-align:left; text-indent:2em; widows:0">
-                            <span style="font-family:仿宋; font-size:12pt">申请人签名：
+                            <span style="font-family:仿宋; font-size:12pt">
-
+                                {{ formData.applyReason }}
-                                <img v-if="formData.applySign" :src="baseurl + formData.applySign" width="200px"
+                            </span>
-                                    height="50px" class="avatar">
+                        </p>
+                        <div style="right:0; line-height:15pt; padding: 0;text-align:right; margin-bottom: 10px;
+                            height: 50px;
+                            position: absolute;">
+                            <div style="font-family:仿宋; font-size:12pt;">
+                                申请人签名：
+                                <img style="margin: 0;" v-if="formData.applySign" :src="baseurl + formData.applySign"
+                                    width="160px" height="40px">
                                 <span>
                                     <span style="margin-left: 40px;">年</span>
                                     <span style="margin-left: 20px;">月</span>
                                     <span style="margin-left: 20px;">日</span>
                                 </span>
-                            </span>
+                            </div>
-                        </p>
+                        </div>
                     </td>
                 </tr>
                 <tr style="height:68.65pt">
                     <td
-                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:20.4pt">
+                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:24.65pt">
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">班级评议意见</span></p>
                     </td>
                     <td colspan="6"
                         style="position: relative; border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:250pt">
-                        <p style="line-height:15pt; margin:10pt 0pt 0pt; orphans:0; text-align:left; text-indent:2em; widows:0"><span
-                                style="font-family:仿宋; font-size:12pt">{{ formData.fdyCmt }}</span>
-                        </p>
                         <p
-                            style="position: absolute;bottom: 0;right:0;  line-height:15pt; margin:0pt; orphans:0; text-align:left; widows:0">
+                            style="line-height:15pt; margin:10pt 0pt 0pt; orphans:0; text-align:left; text-indent:2em; widows:0">
-                            <span style="font-family:仿宋; font-size:12pt">辅导员（签名）：
+                            <span style="font-family:仿宋; font-size:12pt">{{ formData.fdyCmt }}</span>
-                                <img style="display: inline;" v-if="formData.fdySign" :src="baseurl + formData.fdySign"
+                        </p>
-                                    width="100px" height="35px" class="avatar" />
+                        <div
-                            </span><br />
+                            style="position: absolute; bottom: 0; right: 0; line-height: 15pt; margin: 0pt; orphans: 0; text-align: left; widows: 0;">
-                            <span>
+                            <!-- 签名容器：禁止换行并统一子元素排列 -->
+                            <div
+                                style="font-family: 仿宋; font-size: 12pt;display: inline-block; vertical-align: middle; white-space: nowrap;">
+                                <!-- 签名文字 -->
+                                <span style="display: inline-block; vertical-align: middle;">辅导员（签名）：</span>
+                                <!-- 签名图片 -->
+                                <img style="display: inline-block; vertical-align: middle;" v-if="formData.fdySign"
+                                    :src="baseurl + formData.fdySign" width="100px" height="35px" class="avatar" />
+                            </div>
+                            <!-- 日期行 -->
+                            <div style="text-align: right;">
                                 <span style="margin-left: 40px;">年</span>
                                 <span style="margin-left: 20px;">月</span>
                                 <span style="margin-left: 20px;">日</span>
-                            </span>
+                            </div>
-                        </p>
+                        </div>
                     </td>
                     <td
                         style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:24.65pt">
@@ -419,13 +429,15 @@
                                 style="font-family:仿宋; font-size:12pt">&#xa0;</span></p>
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">&#xa0;</span></p>
-                        <p style="line-height:15pt; margin:10pt 0pt 0pt; orphans:0; text-align:left; text-indent:2em; widows:0"><span
+                        <p
-                                style="font-family:仿宋; font-size:12pt">同意推荐</span><span
+                            style="line-height:15pt; margin:10pt 0pt 0pt; orphans:0; text-align:left; text-indent:2em; widows:0">
+                            <span style="font-family:仿宋; font-size:12pt">同意推荐</span><span
                                 style="font-family:仿宋; font-size:12pt">该同学</span><span
                                 style="font-family:仿宋; font-size:12pt">申请</span><span
                                 style="font-family:仿宋; font-size:12pt">国家</span><span
                                 style="font-family:仿宋; font-size:12pt">励志</span><span
-                                style="font-family:仿宋; font-size:12pt">奖学金。</span></p>
+                                style="font-family:仿宋; font-size:12pt">奖学金。</span>
+                        </p>
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">&#xa0;</span></p>
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
@@ -446,7 +458,7 @@
                 </tr>
                 <tr style="height:94.9pt">
                     <td
-                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:20.4pt">
+                        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:24.65pt">
                         <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                                 style="font-family:仿宋; font-size:12pt">学校审核意见</span></p>
                     </td>
@@ -528,4 +540,24 @@ export default {
 
 
 </script>
-<style></style>
+<style>
+.cjk-two-per-line {
+    display: inline-block;
+    width: 2em;
+    /* 两个全角字的宽度 */
+    word-break: break-all;
+    /* 允许在任意字符处断行 */
+    white-space: normal;
+    /* 允许换行 */
+    text-align: center;
+    line-height: 1.6;
+    /* 可按视觉微调行距 */
+}
+
+@media print {
+    .cjk-two-per-line {
+        print-color-adjust: exact;
+        -webkit-print-color-adjust: exact;
+    }
+}
+</style>

src/views/stuCQS/good-class/FdyAll.vue

@@ -112,6 +112,9 @@
       <el-form label-width="120px" size="mini">
         <el-row>
           <el-col :span="12">
+            <el-form-item class="look-form-item" label="学年">
+              <el-input readonly v-model="lookForm.stuYearName"></el-input>
+            </el-form-item>
             <el-form-item class="look-form-item" label="申请人">
               <el-input readonly v-model="lookForm.stuName"></el-input>
             </el-form-item>

src/views/stuCQS/good-class/JwcAll.vue

@@ -142,6 +142,9 @@
       <el-form label-width="120px" size="mini">
         <el-row>
           <el-col :span="12">
+            <el-form-item class="look-form-item" label="学年">
+              <el-input readonly v-model="lookForm.stuYearName"></el-input>
+            </el-form-item>
             <el-form-item class="look-form-item" label="申请人">
               <el-input readonly v-model="lookForm.stuName"></el-input>
             </el-form-item>

src/views/stuCQS/good-class/XwAll.vue

@@ -118,6 +118,9 @@
       <el-form label-width="120px" size="mini">
         <el-row>
           <el-col :span="12">
+            <el-form-item class="look-form-item" label="学年">
+              <el-input readonly v-model="lookForm.stuYearName"></el-input>
+            </el-form-item>
             <el-form-item class="look-form-item" label="申请人">
               <el-input readonly v-model="lookForm.stuName"></el-input>
             </el-form-item>

src/views/stuCQS/good-class/fdy.vue

@@ -98,6 +98,9 @@
       </el-steps>
       <hr />
       <el-form label-width="120px" size="mini">
+        <el-form-item class="look-form-item" label="学年">
+          <el-input readonly v-model="auditForm.stuYearName"></el-input> <span style="color: red;">*审核时请注意申请的学年</span>
+        </el-form-item>
         <el-form-item class="look-form-item" label="申请人">
           <el-input readonly v-model="auditForm.stuName"></el-input>
         </el-form-item>
@@ -166,8 +169,8 @@
           </el-row>
 
           <!-- 只在非编辑模式下显示审核意见 -->
-          <el-input v-if="!editMode" placeholder="请输入审核意见" type="textarea" :maxlength="1000" :autosize="{ minRows: 10, maxRows: 10 }"
+          <el-input v-if="!editMode" placeholder="请输入审核意见" type="textarea" :maxlength="1000"
-            class="auditForm-input" v-model="doForm.fdyCmt"></el-input>
+            :autosize="{ minRows: 10, maxRows: 10 }" class="auditForm-input" v-model="doForm.fdyCmt"></el-input>
         </el-form-item>
       </el-form>
     </el-dialog>

src/views/stuCQS/good-class/jwc.vue

@@ -28,7 +28,7 @@
       </el-form-item>
     </el-form>
     <el-button type="primary" icon="el-icon-edit" size="mini" @click="manyAudit">一键审核通过</el-button>
-
+    <span style="color: red;">*审核时请注意申请的学年</span>
     <el-table v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 
@@ -112,6 +112,9 @@
       </el-steps>
       <hr />
       <el-form label-width="120px" size="mini">
+        <el-form-item class="look-form-item" label="学年">
+          <el-input readonly v-model="auditForm.stuYearName"></el-input> <span style="color: red;">*审核时请注意申请的学年</span>
+        </el-form-item>
         <el-form-item class="look-form-item" label="申请人">
           <el-input readonly v-model="auditForm.stuName"></el-input>
         </el-form-item>

src/views/stuCQS/good-class/stu.vue

@@ -136,6 +136,9 @@
       <el-form label-width="120px" size="mini">
         <el-row>
           <el-col :span="12">
+            <el-form-item class="look-form-item" label="学年">
+              <el-input readonly v-model="lookForm.stuYearName"></el-input>
+            </el-form-item>
             <el-form-item class="look-form-item" label="申请人">
               <el-input readonly v-model="lookForm.stuName"></el-input>
             </el-form-item>
@@ -443,6 +446,11 @@ export default {
     },
     async doApply() {
       let sdata = { ...this.applyForm }
+      if (isEmpty(sdata.stuYearId)) {
+        this.$message.info('请选择学年')
+        return
+      }
+
       if (isEmpty(sdata.classCount)) {
         this.$message.info('请输入班级人数')
         return

src/views/stuCQS/good-class/xw.vue

@@ -24,6 +24,7 @@
     </el-form>
 
     <el-button type="primary" icon="el-icon-edit" size="mini" @click="manyAudit">一键审核通过</el-button>
+    <span style="color: red;">*审核时请注意申请的学年</span>
 
     <el-table v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -107,6 +108,9 @@
       </el-steps>
       <hr />
       <el-form label-width="120px" size="mini">
+        <el-form-item class="look-form-item" label="学年">
+          <el-input readonly v-model="auditForm.stuYearName"></el-input> <span style="color: red;">*审核时请注意申请的学年</span>
+        </el-form-item>
         <el-form-item class="look-form-item" label="申请人">
           <el-input readonly v-model="auditForm.stuName"></el-input>
         </el-form-item>