订单导出

src/newApi/examapply.js

@@ -174,4 +174,12 @@ export default {
             data
         })
     },
-}
+    // 考试安排（修改考场人数）
+    editPeopleNum(data) {
+        return request({
+            url: '/system/apply/update/applyNum',
+            method: 'post',
+            data
+        })
+    },
+}

src/views/education/classManageMent/studentMenu/index.vue

@@ -110,6 +110,16 @@
         <el-option label="是" :value="1"> </el-option>
         <el-option label="否" :value="0"> </el-option>
       </el-select>
+      <el-select
+        clearable
+        v-model="formData.officialStatus"
+        placeholder="是否官方信息报名"
+        style="margin: 5px 10px"
+        size="medium"
+      >
+        <el-option label="是" :value="1"> </el-option>
+        <el-option label="否" :value="0"> </el-option>
+      </el-select>
       <el-input
         clearable
         style="width: 230px; margin: 5px 10px"

src/views/education/examManagement/examArrangement/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="examArrangement">
     <table-list
+      ref="tableList"
       :tableSets="tableSet"
       :tableData="tableData"
       :navText="navText"
@@ -12,11 +13,14 @@
         <el-button size="medium" type="warning" @click="setExamAdress"
           >配置考试地点</el-button
         >
+        <el-button size="medium" type="primary" @click="openPeopleNumDialog"
+          >批量修改人数</el-button
+        >
       </template>
       <template slot="btn" slot-scope="props">
-        <el-button type="text" @click="beforeFunc(props.scope.row)"
+        <!-- <el-button type="text" @click="beforeFunc(props.scope.row)"
           >前培设置</el-button
-        >
+        > -->
         <el-button
           type="text"
           @click="addClick(props.scope.row, 0)"
@@ -29,12 +33,12 @@
           :disabled="props.scope.row.status === 1"
           >考点设置</el-button
         >
-        <el-button
+        <!-- <el-button
           type="text"
           @click="setExams(props.scope.row, 2)"
           :disabled="props.scope.row.status === 1"
           >考培设置</el-button
-        >
+        > -->
         <el-button
           type="text"
           @click="editGoods(props.scope.row)"
@@ -680,6 +684,44 @@
         <el-button @click="dialogExamSync = false">取 消</el-button>
       </span>
     </el-dialog>
+    <!-- 修改人数弹窗 -->
+    <el-dialog
+      @closed="loadingClose"
+      :visible.sync="isPeopleNumDialog"
+      width="500px"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <div slot="title" class="hearders">
+          <div class="leftTitle">修改人数</div>
+      </div>
+      <div>
+        <el-form
+          label-position="right"
+          label-width="150px"
+          :model="peopleNumDate"
+          :rules="peopleRules"
+          ref="peopleNum"
+        >
+          <el-form-item label="人数" prop="num">
+            <el-input-number
+                  v-model="peopleNumDate.num"
+                  :min="0"
+                  :controls="false"
+            ></el-input-number>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="isPeopleNumDialog = false">取 消</el-button>
+        <el-button
+          type="primary"
+          :loading="disabledBtn"
+          @click="handlePeopleNum"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
     <before-page ref="beforePage" />
     <applicable-products ref="applicableProducts" />
     <downMaterial ref="downMaterial" />
@@ -718,6 +760,9 @@ export default {
       pageSize2: 10,
       currentPage2: 1,
       loading: false, //当前表单加载是否加载动画
+      isPeopleNumDialog: false,
+      peopleRules: { num: [{ required: true, message: "请输入", trigger: "blur" }]},
+      peopleNumDate: {},
       navText: {
         title: "考试安排",
         index: 0,
@@ -902,6 +947,32 @@ export default {
       link.click();
       link.remove();
     },
+    // 打开修改人数弹窗
+    openPeopleNumDialog() {
+      if (!this.$refs.tableList.allCheckData.length) {
+        this.$message.warning("请选中选项！")
+        return
+      }
+      this.isPeopleNumDialog = true
+      this.peopleNumDate.num = 0
+      this.peopleNumDate.applyIds = this.$refs.tableList.allCheckData.map(item => item.applyId)
+    },
+    // 保存修改人数
+    handlePeopleNum() {
+      this.isPeopleNumDialog = false
+      this.$refs['peopleNum'].validate((valid) => {
+        if (valid) {
+          this.$api.editPeopleNum(this.peopleNumDate).then(res => {
+            this.$message.success("修改人数成功");
+            this.search();
+          }).finally(() => {
+            console.log('error submit!')
+          })
+        } else {
+          return false;
+        }
+      });
+    },
     //下载资料
     downMaterial(row) {
       this.$refs.downMaterial.openBox(row);

src/views/education/mockTestManagement/mockTestData/recordQusetion/index.vue

@@ -328,7 +328,7 @@ export default {
           this.$set(
             this.getInfoRecord.historyExamJson[index],
             "scoreResult",
-            value
+            Number(value)
           );
         })
         .catch(() => {});
@@ -374,7 +374,7 @@ export default {
             data.historyExamJson[i].type === 5) &&
           data.historyExamJson[i].scoreResult
         ) {
-          data.score += data.historyExamJson[i].scoreResult;
+          data.score += Number(data.historyExamJson[i].scoreResult);
         }
       }
       data.historyExamJson = JSON.stringify(data.historyExamJson);

src/views/finance/invoiceManage/dialogExamine.vue

@@ -29,8 +29,7 @@
           ><br />
           <!-- 订购人数：<span>{{ orderInfo.userNum || 0 }} 位</span
           >订购数量：<span>{{ orderInfo.goodsNum }} 个</span> -->
-          下单金额：<span
-            >￥{{ orderInfo.orderPrice | formatPrice }}</span
+          下单金额：<span>￥{{ orderInfo.orderPrice | formatPrice }}</span
           >退款金额：<span
             >￥<span v-if="orderInfo.refundPrice">{{
               orderInfo.refundPrice | formatPrice
@@ -58,9 +57,11 @@
               : invoiceInfo.subject == 2
               ? "企业"
               : ""
-          }}</span
-          > {{invoiceInfo.subject == 1 ? '姓名：':'企业全称：'}}<span>{{ invoiceInfo.invoiceTitle }}</span
-          >{{invoiceInfo.subject == 1 ? '身份证号：':'纳税人号：'}}<span>{{ invoiceInfo.taxRegistryNumber }}</span
+          }}</span>
+          {{ invoiceInfo.subject == 1 ? "姓名：" : "企业全称："
+          }}<span>{{ invoiceInfo.invoiceTitle }}</span
+          >{{ invoiceInfo.subject == 1 ? "身份证号：" : "纳税人号："
+          }}<span>{{ invoiceInfo.taxRegistryNumber }}</span
           ><br />开票备注：<span>{{ invoiceInfo.openRemark }}</span
           ><template v-if="checkList.includes('2')">
             收票邮箱：<span>{{ invoiceInfo.email }}</span></template
@@ -93,32 +94,42 @@
             <div slot="default">
               <el-button type="text" style="line-height: 22px"
                 >+上传发票<br /><span style="color: #999"
-                  >支持PNG/JPG</span
+                  >支持PNG/JPG/PDF</span
                 ></el-button
               >
             </div>
             <!-- <i slot="default" class="el-icon-plus"></i> -->
             <div slot="file" slot-scope="{ file }">
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="file.url"
-                alt=""
-              />
-              <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
-                  <i class="el-icon-zoom-in"></i>
-                </span>
-                <span
-                  v-if="!disabled"
-                  class="el-upload-list__item-delete"
-                  @click="beforeRemove(file)"
-                >
-                  <i class="el-icon-delete"></i>
+              <div>
+                <img
+                  v-if="file.name.toLowerCase().split('.').splice(-1)[0] !== 'pdf' "
+                  class="el-upload-list__item-thumbnail"
+                  :src="file.url"
+                  alt=""
+                />
+                <span class="el-upload-list__item-actions">
+                  <span
+                    v-if="file.name.toLowerCase().split('.').splice(-1)[0] !== 'pdf'"
+                    class="el-upload-list__item-preview"
+                    @click="handlePictureCardPreview(file)"
+                  >
+                    <i class="el-icon-zoom-in"></i>
+                  </span>
+                  <span
+                    v-if="!disabled"
+                    class="el-upload-list__item-delete"
+                    @click="beforeRemove(file)"
+                  >
+                    <i class="el-icon-delete"></i>
+                  </span>
                 </span>
-              </span>
+              </div>
+              <div
+                v-if="file.name.toLowerCase().split('.').splice(-1)[0] == 'pdf'"
+                style="text-align: center; line-height: 145px"
+              >
+                {{ file.name }}
+              </div>
             </div>
           </el-upload>
         </div>
@@ -206,17 +217,17 @@ export default {
     uploadFile(fileObj) {
       let file = fileObj.file;
       var type = file.name.toLowerCase().split(".").splice(-1);
-      let typeList = ["jpg", "png"];
+      let typeList = ["jpg", "png", "pdf"];
       if (!typeList.includes(type[0])) {
-        this.$message.error("上传格式需为：.jpg/.png");
+        this.$message.error("上传格式需为：.jpg/.png/.pdf");
         const idx = this.$refs.uploadFile.uploadFiles.findIndex(
           (item) => item.uid === file.uid
         );
         this.$refs.uploadFile.uploadFiles.splice(idx, 1);
         return;
       }
-      if (file.size > 0.3 * 1024 * 1024) {
-        this.$message.error("图片不得大于300kb");
+      if (file.size > 1 * 1024 * 1024) {
+        this.$message.error("文件不得大于1MB");
         const idx = this.$refs.uploadFile.uploadFiles.findIndex(
           (item) => item.uid === file.uid
         );

src/views/systemManagement/roleManagement/index.vue

@@ -44,7 +44,7 @@
         <el-row :gutter="10">
           <el-form
             label-position="right"
-            label-width="100px"
+            label-width="110px"
             :model="listData"
             :rules="rules"
             ref="listData"
@@ -151,6 +151,7 @@
                   :disabled="statusPop === 2"
                   v-else-if="items.scope === 'textarea'"
                   type="textarea"
+                  :rows="1"
                   v-model="listData[items.prop]"
                 ></el-input>
                 <el-input-number
@@ -265,6 +266,22 @@ export default {
           hidden: true,
           scope: "status",
         },
+        {
+          label: "手机号码权限",
+          prop: "phoneConceal",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "显示",
+              value: 1,
+            },
+            {
+              label: "隐藏",
+              value: 0,
+            },
+          ],
+        },
         {
           label: "创建时间",
           prop: "createTime",
@@ -315,6 +332,27 @@ export default {
             },
           ],
         },
+        {
+          label: "手机号码权限",
+          prop: "phoneConceal",
+          hidden: true,
+          scope: "status",
+          options: [
+            {
+              label: "显示",
+              value: 1,
+            },
+            {
+              label: "隐藏",
+              value: 0,
+            },
+          ],
+        },
+        {
+          label: "备注",
+          prop: "remark",
+          scope: "textarea",
+        },
         {
           label: "菜单权限",
           prop: "menuIds",
@@ -325,11 +363,6 @@ export default {
           prop: "keys",
           scope: "treeInfo",
         },
-        {
-          label: "备注",
-          prop: "remark",
-          scope: "textarea",
-        },
       ],
       //   弹窗数据
       listData: {},
@@ -347,6 +380,7 @@ export default {
           { required: true, message: "请输入岗位顺序", trigger: "blur" },
         ],
         status: [{ required: true, message: "请选择状态", trigger: "change" }],
+        phoneConceal: [{ required: true, message: "请选择手机号码权限", trigger: "change" }],
         // remark: [{ required: true, message: "请填写备注", trigger: "blur" }],
       },
     };
@@ -555,6 +589,7 @@ export default {
         roleKey: undefined,
         roleSort: 0,
         status: "",
+        phoneConceal: 0,
         menuIds: [],
         deptIds: [],
         menuCheckStrictly: true,