Ver código fonte

1.学习学时记录(新增录单单号查询导出)2.隐藏暂不更新代码

xiexaing 1 ano atrás
pai
commit
dd3d54ec16

+ 5 - 0
src/views/education/classManageMent/learningHoursRecordList/index.vue

@@ -192,6 +192,10 @@ export default {
           scope: "moreDataPicker",
           Diszing: true,
         },
+        {
+          prop: "inputOrderSn",
+          placeholder: "录单单号",
+        },
         {
           prop: "idCard",
           placeholder: "身份证",
@@ -438,6 +442,7 @@ export default {
         searchEndTime: this.formData.searchEndTime / 1000 || "",
         periodStatus: this.formData.periodStatus || "",
         idCard: this.formData.idCard || "",
+        inputOrderSn: this.formData.inputOrderSn || "",
         officialStatus:
           this.formData.studyStatus === 2 && this.formData.periodStatus === 1
             ? this.formData.periodPlush

+ 6 - 6
src/views/education/examManagement/examArrangement/index.vue

@@ -13,14 +13,14 @@
         <el-button size="medium" type="warning" @click="setExamAdress"
           >配置考试地点</el-button
         >
-        <el-button size="medium" type="primary" @click="openPeopleNumDialog"
+        <!-- <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)"
@@ -33,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)"

+ 39 - 40
src/views/systemManagement/roleManagement/index.vue

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