chore: 新增marywood办事大厅

src/modules/offices/src/certSchool/edit.vue

@@ -11,7 +11,7 @@
           <el-form-item label="班级" prop="class_name">
             <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
-          <el-form-item label="Sofia ID" prop="sofia_id">
+          <el-form-item label="Marywood ID" prop="sofia_id">
             <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <el-form-item label="出生年月" prop="birth_date">
@@ -56,7 +56,7 @@ export default {
       rules: {
         personal_name: [{ required: true, message: '请输入您的姓名', trigger: 'blur' }],
         class_name: [{ required: true, message: '请输入您的班级', trigger: 'blur' }],
-        sofia_id: [{ required: true, message: '请输入Sofia ID', trigger: 'blur' }],
+        sofia_id: [{ required: true, message: '请输入Marywood ID', trigger: 'blur' }],
         birth_date: [{ required: true, message: '请选择出生年月', trigger: 'blur' }]
       }
     }

src/modules/offices/src/certSchool/list.vue

@@ -14,7 +14,7 @@ export default {
   data() {
     return {
       columns: [
-        { prop: 'form.sofia_id', label: 'Sofia ID' },
+        { prop: 'form.sofia_id', label: 'Marywood ID' },
         { prop: 'form.personal_name', label: '姓名' },
         { prop: 'form.class_name', label: '班级' },
         { prop: 'form.birth_date', label: '出生日期' },

src/modules/offices/src/certStudy/edit.vue

@@ -11,7 +11,7 @@
           <el-form-item label="班级" prop="class_name">
             <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
-          <el-form-item label="Sofia ID" prop="sofia_id">
+          <el-form-item label="Marywood ID" prop="sofia_id">
             <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <el-form-item label="在读证明收件人是否为本人" prop="is_self">
@@ -71,7 +71,7 @@ export default {
       rules: {
         personal_name: [{ required: true, message: '请输入您的姓名', trigger: 'blur' }],
         class_name: [{ required: true, message: '请输入您的班级', trigger: 'blur' }],
-        sofia_id: [{ required: true, message: '请输入Sofia ID', trigger: 'blur' }],
+        sofia_id: [{ required: true, message: '请输入Marywood ID', trigger: 'blur' }],
         receive_name: [{ required: true, message: '请输入收件人名字', trigger: 'blur' }],
         telephone: [{ required: true, message: '请输入收件人联系电话', trigger: 'blur' }],
         email: [{ required: true, message: '请输入在读证明邮寄地址', trigger: 'blur' }]

src/modules/offices/src/reportE/edit.vue

@@ -20,7 +20,7 @@
           <el-form-item label="班级" prop="class_name">
             <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
-          <el-form-item label="Sofia ID" prop="sofia_id">
+          <el-form-item label="Marywood ID" prop="sofia_id">
             <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <template v-if="isView">
@@ -61,7 +61,7 @@ export default {
       rules: {
         personal_name: [{ required: true, message: '请输入您的姓名', trigger: 'blur' }],
         class_name: [{ required: true, message: '请输入您的班级', trigger: 'blur' }],
-        sofia_id: [{ required: true, message: '请输入Sofia ID', trigger: 'blur' }]
+        sofia_id: [{ required: true, message: '请输入Marywood ID', trigger: 'blur' }]
       }
     }
   },

src/modules/offices/src/reportE/list.vue

@@ -14,7 +14,7 @@ export default {
   data() {
     return {
       columns: [
-        { prop: 'form.sofia_id', label: 'Sofia ID' },
+        { prop: 'form.sofia_id', label: 'Marywood ID' },
         { prop: 'form.class_name', label: '班级' },
         { prop: 'status_name', label: '审批状态' },
         { prop: 'approve_time1', label: '审批时间' },

src/modules/offices/src/reportPaper/edit.vue

@@ -11,7 +11,7 @@
           <el-form-item label="班级" prop="class_name">
             <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
-          <el-form-item label="Sofia ID" prop="sofia_id">
+          <el-form-item label="Marywood ID" prop="sofia_id">
             <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <el-form-item label="成绩单收件人是否为本人" prop="is_self">
@@ -104,7 +104,7 @@ export default {
       rules: {
         personal_name: [{ required: true, message: '请输入您的姓名', trigger: 'blur' }],
         class_name: [{ required: true, message: '请输入您的班级', trigger: 'blur' }],
-        sofia_id: [{ required: true, message: '请输入Sofia ID', trigger: 'blur' }],
+        sofia_id: [{ required: true, message: '请输入Marywood ID', trigger: 'blur' }],
         number: [{ required: true, message: '请输入需打印份数', trigger: 'blur' }],
         receive_name: [{ required: true, message: '请输入收件人名字', trigger: 'blur' }],
         telephone: [{ required: true, message: '请输入收件人联系电话', trigger: 'blur' }],

src/modules/offices/src/retake/edit.vue

@@ -18,7 +18,7 @@
         <el-form-item label="班级" prop="class_name">
           <el-input v-model="ruleForm.class_name" :disabled="disabledInfo" readonly />
         </el-form-item>
-        <el-form-item label="Sofia ID" prop="sofia_id">
+        <el-form-item label="Marywood ID" prop="sofia_id">
           <el-input v-model="ruleForm.sofia_id" :disabled="disabledInfo" readonly />
         </el-form-item>
         <el-form-item label="重修时间" prop="semester_name">
@@ -112,7 +112,7 @@ export default {
       rules: {
         personal_name: [{ required: true, message: '请输入您的姓名', trigger: 'blur' }],
         class_name: [{ required: true, message: '请输入您的班级', trigger: 'blur' }],
-        sofia_id: [{ required: true, message: '请输入Sofia ID', trigger: 'blur' }],
+        sofia_id: [{ required: true, message: '请输入Marywood ID', trigger: 'blur' }],
         semester_name: [{ required: true, message: '请选择您的重修时间', trigger: 'blur' }],
         course_id: [{ required: true, message: '请选择您的重修课程', trigger: 'blur' }]
       },

src/modules/offices/src/retake/list.vue

@@ -14,7 +14,7 @@ export default {
   data() {
     return {
       columns: [
-        { prop: 'form.sofia_id', label: 'Sofia ID' },
+        { prop: 'form.sofia_id', label: 'Marywood ID' },
         { prop: 'form.semester_name', label: '重修时间' },
         { prop: 'form.course_name', label: '重修课程' },
         { prop: 'status_name', label: '审批状态', attrs: { width: '100' } },

src/modules/offices/src/share/edit.vue

@@ -4,7 +4,7 @@
     <div class="con-box">
       <el-button type="text" @click="goBack">{{ $t('pages.affairsHall.shareAdd.backlist') }}</el-button>
       <div class="main-form">
-        <el-form label-width="100px" :disabled="isView" ref="ruleForm" :model="ruleForm" :rules="rules">
+        <el-form label-width="110px" :disabled="isView" ref="ruleForm" :model="ruleForm" :rules="rules">
           <el-form-item :label="$t('pages.affairsHall.shareAdd.sname')" prop="personal_name">
             <el-input v-model="ruleForm.personal_name" :placeholder="$t('pages.affairsHall.shareAdd.inputname')" />
           </el-form-item>
@@ -12,7 +12,7 @@
             <el-input v-model="ruleForm.trade_name" :placeholder="$t('pages.affairsHall.shareAdd.inputindustry')" />
           </el-form-item>
           <el-form-item :label="$t('pages.affairsHall.shareAdd.age')" prop="age">
-            <el-input v-model="ruleForm.age" :placeholder="$t('pages.affairsHall.shareAdd.inputage')" />
+            <el-input type="number" v-model="ruleForm.age" :placeholder="$t('pages.affairsHall.shareAdd.inputage')" />
           </el-form-item>
           <el-form-item :label="$t('pages.affairsHall.shareAdd.classs')" prop="class_name">
             <el-input v-model="ruleForm.class_name" :placeholder="$t('pages.affairsHall.shareAdd.inputclasss')" />
@@ -20,12 +20,23 @@
           <el-form-item :label="$t('pages.affairsHall.shareAdd.phone')" prop="telephone">
             <el-input v-model="ruleForm.telephone" :placeholder="$t('pages.affairsHall.shareAdd.inputphone')" />
           </el-form-item>
+          <el-form-item label="分享大概时间" prop="sharing_time">
+            <el-date-picker
+              v-model="ruleForm.sharing_time"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择分享时间"
+            ></el-date-picker>
+          </el-form-item>
           <el-form-item :label="$t('pages.affairsHall.shareAdd.Sharingthemes')" prop="sharing_theme">
             <el-input
               v-model="ruleForm.sharing_theme"
               :placeholder="$t('pages.affairsHall.shareAdd.inputSharingthemes')"
             />
           </el-form-item>
+          <el-form-item label="分享内容简介" prop="content_introduction">
+            <el-input type="textarea" v-model="ruleForm.content_introduction" placeholder="请输入分享内容简介" />
+          </el-form-item>
           <template v-if="isView">
             <el-form-item v-if="detail.approve_time" :label="$t('pages.affairsHall.shareAdd.approvalTime')">
               <el-input v-model="detail.approve_time" />
@@ -66,7 +77,9 @@ export default {
         age: [{ required: true, message: '请输入您的年龄', trigger: 'blur' }],
         class_name: [{ required: true, message: '请输入您的班级', trigger: 'blur' }],
         telephone: [{ required: true, message: '请输入您的电话', trigger: 'blur' }],
-        sharing_theme: [{ required: true, message: '请输入分享主题', trigger: 'blur' }]
+        sharing_theme: [{ required: true, message: '请输入分享主题', trigger: 'blur' }],
+        sharing_time: [{ required: true, message: '请选择分享时间', trigger: 'change' }],
+        content_introduction: [{ required: true, message: '请输入分享内容简介', trigger: 'blur' }]
       }
     }
   },

src/modules/offices/src/studyContinue/edit.vue

@@ -11,7 +11,7 @@
           <el-form-item label="班级" prop="class_name">
             <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
-          <el-form-item label="Sofia ID" prop="sofia_id">
+          <el-form-item label="Marywood ID" prop="sofia_id">
             <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <el-form-item label="复学时间" prop="semester_name">
@@ -60,7 +60,7 @@ export default {
       rules: {
         personal_name: [{ required: true, message: '请输入您的姓名', trigger: 'blur' }],
         class_name: [{ required: true, message: '请输入您的班级', trigger: 'blur' }],
-        sofia_id: [{ required: true, message: '请输入Sofia ID', trigger: 'blur' }],
+        sofia_id: [{ required: true, message: '请输入Marywood ID', trigger: 'blur' }],
         semester_name: [{ required: true, message: '请选择复学时间', trigger: 'blur' }]
       },
       // 学期列表

src/modules/offices/src/studyContinue/list.vue

@@ -14,7 +14,7 @@ export default {
   data() {
     return {
       columns: [
-        { prop: 'form.sofia_id', label: 'Sofia ID' },
+        { prop: 'form.sofia_id', label: 'Marywood ID' },
         { prop: 'form.class_name', label: '班级' },
         { prop: 'form.semester_name', label: '复学时间' },
         { prop: 'status_name', label: '审批状态' },

src/modules/offices/src/studyPause/edit.vue

@@ -11,7 +11,7 @@
           <el-form-item label="班级" prop="class_name">
             <el-input v-model="ruleForm.class_name" readonly />
           </el-form-item>
-          <el-form-item label="Sofia ID" prop="sofia_id">
+          <el-form-item label="Marywood ID" prop="sofia_id">
             <el-input v-model="ruleForm.sofia_id" readonly />
           </el-form-item>
           <el-form-item label="休学时间" prop="semester_name">
@@ -64,7 +64,7 @@ export default {
       rules: {
         personal_name: [{ required: true, message: '请输入您的姓名', trigger: 'blur' }],
         class_name: [{ required: true, message: '请输入您的班级', trigger: 'blur' }],
-        sofia_id: [{ required: true, message: '请输入Sofia ID', trigger: 'blur' }],
+        sofia_id: [{ required: true, message: '请输入Marywood ID', trigger: 'blur' }],
         semester_name: [{ required: true, message: '请选择休学时间', trigger: 'blur' }],
         reason: [{ required: true, message: '请输入休学原因', trigger: 'blur' }]
       },

src/modules/offices/src/studyPause/list.vue

@@ -14,7 +14,7 @@ export default {
   data() {
     return {
       columns: [
-        { prop: 'form.sofia_id', label: 'Sofia ID' },
+        { prop: 'form.sofia_id', label: 'Marywood ID' },
         { prop: 'form.semester_name', label: '休学时间' },
         { prop: 'form.reason', label: '休学原因' },
         { prop: 'status_name', label: '审批状态' },

src/pages/affairsHall/components/hall-form.vue

 <template>
   <div class="hall-form">
-    <el-radio
-      v-model="schoolReport"
-      @change="changeReport"
-      label="elreport"
-      border
-      size="small"
-    >{{ $t('pages.affairsHall.hall-form.electronicreportcard') }}</el-radio>
-    <el-radio
-      v-model="schoolReport"
-      @change="changeReport"
-      label="pareport"
-      border
-      size="small"
-    >{{ $t('pages.affairsHall.hall-form.Paperreportcard') }}</el-radio>
+    <el-radio v-model="schoolReport" @change="changeReport" label="elreport" border size="small">{{
+      $t('pages.affairsHall.hall-form.electronicreportcard')
+    }}</el-radio>
+    <el-radio v-model="schoolReport" @change="changeReport" label="pareport" border size="small">{{
+      $t('pages.affairsHall.hall-form.Paperreportcard')
+    }}</el-radio>
     <el-form
       :model="ruleForm"
       :rules="rules"
@@ -30,16 +22,33 @@
       <el-form-item label="班级" prop="class_name">
         <el-input v-model.trim="ruleForm.class_name"></el-input>
       </el-form-item>-->
-      <el-form-item label="Sofia ID" prop="sofia_id" key="sofia_id">
+      <el-form-item label="Marywood ID" prop="sofia_id" key="sofia_id">
         <el-input v-model.trim="ruleForm.sofia_id"></el-input>
       </el-form-item>
-      <el-form-item :label="$t('pages.affairsHall.hall-form.phone')" prop="telephone" key="telephone" v-if="schoolReport === 'pareport'">
+      <el-form-item
+        :label="$t('pages.affairsHall.hall-form.phone')"
+        prop="telephone"
+        key="telephone"
+        v-if="schoolReport === 'pareport'"
+      >
         <el-input v-model.trim="ruleForm.telephone"></el-input>
       </el-form-item>
-      <el-form-item :label="schoolReport === 'elreport' ? $t('pages.affairsHall.hall-form.email'):$t('pages.affairsHall.hall-form.email2') " prop="email">
+      <el-form-item
+        :label="
+          schoolReport === 'elreport'
+            ? $t('pages.affairsHall.hall-form.email')
+            : $t('pages.affairsHall.hall-form.email2')
+        "
+        prop="email"
+      >
         <el-input v-model.trim="ruleForm.email"></el-input>
       </el-form-item>
-      <el-form-item :label="$t('pages.affairsHall.hall-form.printed')" prop="number" key="number" v-if="schoolReport === 'pareport'">
+      <el-form-item
+        :label="$t('pages.affairsHall.hall-form.printed')"
+        prop="number"
+        key="number"
+        v-if="schoolReport === 'pareport'"
+      >
         <el-input v-model.trim="ruleForm.number"></el-input>
       </el-form-item>
       <el-form-item class="ts-width">
@@ -53,10 +62,11 @@
         </span>
       </el-form-item>
       <el-form-item class="ts-width">
-        <el-button
-          type="primary"
-          @click="submitForm('ruleForm')"
-        >{{Number(ruleForm.submit) === 1 ? $t('pages.affairsHall.hall-form.examSubmitted') : $t('pages.affairsHall.hall-form.examSubmit') }}</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">{{
+          Number(ruleForm.submit) === 1
+            ? $t('pages.affairsHall.hall-form.examSubmitted')
+            : $t('pages.affairsHall.hall-form.examSubmit')
+        }}</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -112,7 +122,7 @@ export default {
     var checksofiaId = (rule, value, callback) => {
       var boolean = new RegExp('^[1-9][0-9]*$').test(value)
       if (!value) {
-        callback(new Error('请输入Sofia ID！'))
+        callback(new Error('请输入Marywood ID！'))
       } else if (!boolean) {
         callback(new Error('请输入正整数！'))
       } else {

src/pages/affairsHall/retake/edit.vue

@@ -7,13 +7,7 @@
       </el-button>
       <el-row type="flex" justify="center">
         <el-col :lg="12">
-          <el-form
-            ref="form"
-            :model="ruleForm"
-            :rules="rules"
-            :disabled="isView"
-            label-width="110px"
-          >
+          <el-form ref="form" :model="ruleForm" :rules="rules" :disabled="isView" label-width="110px">
             <el-form-item label="姓名" prop="personal_name" required>
               <el-input
                 v-model="ruleForm.personal_name"
@@ -23,19 +17,14 @@
               />
             </el-form-item>
             <el-form-item label="班级" prop="class_name" required>
-              <el-input
-                v-model="ruleForm.class_name"
-                readonly
-                :disabled="disabledInfo"
-                placeholder="请输入您的班级"
-              />
+              <el-input v-model="ruleForm.class_name" readonly :disabled="disabledInfo" placeholder="请输入您的班级" />
             </el-form-item>
-            <el-form-item label="Sofia ID" prop="sofia_id" required>
+            <el-form-item label="Marywood ID" prop="sofia_id" required>
               <el-input
                 v-model="ruleForm.sofia_id"
                 readonly
                 :disabled="disabledInfo"
-                placeholder="请输入您的Sofia ID"
+                placeholder="请输入您的Marywood ID"
               />
             </el-form-item>
             <el-form-item label="重修学期" prop="semester_name">
@@ -50,16 +39,13 @@
             </el-form-item>
             <el-form-item label="重修课程" prop="course_id">
               <el-checkbox-group v-model="ruleForm.course_id">
-                <el-checkbox
-                  v-for="item in courseList"
-                  :label="item.id"
-                  :key="item.id"
-                  :disabled="disabledInfo"
-                >{{item.course_name}}</el-checkbox>
+                <el-checkbox v-for="item in courseList" :label="item.id" :key="item.id" :disabled="disabledInfo">{{
+                  item.course_name
+                }}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <div style="padding-left:110px" v-if="hasPay">
-              <div class="score" v-if="detail.form">{{detail.form.score_sum_str}}</div>
+              <div class="score" v-if="detail.form">{{ detail.form.score_sum_str }}</div>
               <pay :datalist="ruleForm.payment_instrument" :disabled="disabledPay || isView"></pay>
             </div>
             <template v-if="isView && detail.status !== -1">
@@ -67,12 +53,7 @@
                 <el-input :value="detail.approve_time1" readonly />
               </el-form-item>
               <el-form-item label="备注" prop="content">
-                <el-input
-                  type="textarea"
-                  :autosize="{ minRows: 5 }"
-                  :value="detail.remark"
-                  readonly
-                />
+                <el-input type="textarea" :autosize="{ minRows: 5 }" :value="detail.remark" readonly />
               </el-form-item>
             </template>