浏览代码

fiex:修复bug

Tang 3 年之前
父节点
当前提交
ace5d55cb6

+ 1 - 0
src/components/questionBank.vue

@@ -899,6 +899,7 @@ export default {
   display: flex;
   margin-bottom: 15px;
   .spans {
+    flex-shrink: 0;
     text-align: right;
     width: 80px;
   }

+ 2 - 2
src/views/education/classManageMent/learningHoursRecordList/hoursTimesRecord.vue

@@ -18,9 +18,9 @@
       >
       <span style="margin-left: 10px"
         ><strong style="color: red">「4」</strong>学习时间:{{
-          $methodsTools.onlyForma(objs.studyStartTime, false)
+          $methodsTools.onlyForma(userData.studyStartTime, false)
         }}
-        - {{ $methodsTools.onlyForma(objs.studyEndTime, false) }}</span
+        - {{ $methodsTools.onlyForma(userData.studyEndTime, false) }}</span
       >
     </div>
     <div class="dis_fs">

+ 2 - 2
src/views/education/classManageMent/learningHoursRecordList/studyTimesRecord.vue

@@ -18,9 +18,9 @@
       >
       <span style="margin-left: 10px"
         ><strong style="color: red">「4」</strong>学习时间:{{
-          $methodsTools.onlyForma(objs.studyStartTime, false)
+          $methodsTools.onlyForma(userData.studyStartTime, false)
         }}
-        - {{ $methodsTools.onlyForma(objs.studyEndTime, false) }}</span
+        - {{ $methodsTools.onlyForma(userData.studyEndTime, false) }}</span
       >
     </div>
 

+ 1 - 2
src/views/education/examManagement/applicationData/asPlanned.vue

@@ -356,7 +356,7 @@ export default {
         index: 0,
         ch: "条",
         num: false,
-        tableHide:true,
+        tableHide: true,
         choice: true,
         changeWidth: "240px",
         addHide: true,
@@ -997,7 +997,6 @@ export default {
         });
     },
     addClick(v, int) {
-      console.log(v);
       // int = 2详情 3学员管理
       if (v === undefined) {
         // 添加班级

+ 4 - 4
src/views/education/examManagement/applicationData/bulkImportPlan/newYY.vue

@@ -254,9 +254,9 @@ export default {
         {
           label: "出错原因",
           prop: "cause",
-          width:"",
+          width: "",
           hidden: true,
-          width:"260px"
+          width: "260px",
         },
       ],
     };
@@ -409,7 +409,7 @@ export default {
           this.tableDataSuccess = res.data.successList;
           this.tableDataError = res.data.errorList;
           this.typeInt = 1;
-          this.$message.info("导入操作执行成功")
+          this.$message.info("导入操作执行成功");
         })
         .finally(() => {
           e.target.value = "";
@@ -429,7 +429,7 @@ export default {
           this.tableDataSuccess = res.data.successList;
           this.tableDataError = res.data.errorList;
           this.typeInt = 2;
-          this.$message.info("导入操作执行成功")
+          this.$message.info("导入操作执行成功");
         })
         .finally(() => {
           e.target.value = "";

+ 7 - 0
src/views/education/examManagement/applicationData/formerAccount/index.vue

@@ -161,6 +161,11 @@ export default {
           placeholder: "前培计划",
           scope: "beforeList",
         },
+        {
+          prop: "applyId",
+          placeholder: "考试计划",
+          scope: "examList",
+        },
         {
           prop: "beforeStatus",
           placeholder: "开通状态",
@@ -188,6 +193,7 @@ export default {
       ],
       formData: {
         beforeId: "",
+        applyId:"",
         pageSize: 10,
         pageNum: 1,
         idCards: "",
@@ -487,6 +493,7 @@ export default {
           idCards: "",
           canBefore: 1,
           beforeId: this.copyAppid,
+          applyId:"",
           beforeStatus: "",
         };
       }

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

@@ -929,9 +929,8 @@ export default {
           this.listDataGoods.goodsId = [];
         }
         this.$api
-          .inquirepayservelistGoods({ businessId: value })
+          .inquirepayservelistGoods({ businessId: value, goodsType: 1 })
           .then((res) => {
-            console.log(1121, res.rows);
             this.goodsList = res.rows;
           });
       }
@@ -948,7 +947,10 @@ export default {
         .inquirepayservegoodsInfo({ applyId: row.applyId })
         .then((res) => {
           this.$api
-            .inquirepayservelistGoods({ businessId: res.data.businessId })
+            .inquirepayservelistGoods({
+              businessId: res.data.businessId,
+              goodsType: 1,
+            })
             .then((result) => {
               this.goodsList = result.rows;
             });
@@ -1277,7 +1279,6 @@ export default {
       this.search();
     },
     watchs(v) {
-      console.log(v);
       this.$api.obtainsystemapply(v.applyId).then((res) => {
         if (res.data.applyStatus) {
           res.data.applyStatus = res.data.applyStatus.split(",").map(Number);
@@ -1310,7 +1311,6 @@ export default {
             }
           }
         }
-        console.log(res.data);
         this.infoData = res.data;
         this.dialoginfoWatch = true;
       });

+ 5 - 3
src/views/education/examManagement/qianpeiArrange/index.vue

@@ -520,7 +520,7 @@ export default {
           this.listDataGoods.goodsId = [];
         }
         this.$api
-          .inquiresystembeforelistGoods({ businessId: value })
+          .inquiresystembeforelistGoods({ businessId: value, goodsType: 1 })
           .then((res) => {
             this.goodsList = res.rows;
           });
@@ -543,7 +543,10 @@ export default {
         .inquiresystembeforelistGoodsgoodsInfo({ beforeId: row.beforeId })
         .then((res) => {
           this.$api
-            .inquiresystembeforelistGoods({ businessId: res.data.businessId })
+            .inquiresystembeforelistGoods({
+              businessId: res.data.businessId,
+              goodsType: 1,
+            })
             .then((result) => {
               this.goodsList = result.rows;
             });
@@ -592,7 +595,6 @@ export default {
         this.dialogVisiblenew = false;
         this.search();
       });
-      console.log(data, 321);
     },
     //获取初始基础参数
     getDict() {

+ 2 - 0
src/views/resource/bankManagement/volumeManagement/edit/index.vue

@@ -64,6 +64,7 @@
               >
             </div>
             <el-button
+              disabled
               slot="reference"
               style="margin-left: 12px"
               @click="getMessage"
@@ -592,6 +593,7 @@ export default {
       });
       var data1 = {
         moduleExamId: this.listData.moduleExamId,
+        moduleName: this.listData.moduleName,
         name: this.listData.name,
         chapterList: chapterList,
         publishStatus: this.listData.publishStatus,

+ 13 - 13
src/views/systemManagement/roleManagement/index.vue

@@ -292,11 +292,11 @@ export default {
           prop: "menuIds",
           scope: "tree",
         },
-        // {
-        //   label: "数据池权限",
-        //   prop: "keys",
-        //   scope: "treeInfo",
-        // },
+        {
+          label: "数据池权限",
+          prop: "keys",
+          scope: "treeInfo",
+        },
         {
           label: "备注",
           prop: "remark",
@@ -412,13 +412,13 @@ export default {
             self.listData = res.data;
             self.dialogVisible = true;
             await self.getMenuListInfo();
-            // if (res.data.businessIds) {
-            //   res.data.businessIds.forEach((v) => {
-            //     self.$nextTick(() => {
-            //       self.$refs.info[0].setChecked("yw-" + v, true, false);
-            //     });
-            //   });
-            // }
+            if (res.data.businessIds) {
+              res.data.businessIds.forEach((v) => {
+                self.$nextTick(() => {
+                  self.$refs.info[0].setChecked("yw-" + v, true, false);
+                });
+              });
+            }
             self.$nextTick(() => {
               self.$refs.listData.clearValidate();
             });
@@ -477,7 +477,7 @@ export default {
     rulesTableSumbit() {
       this.disabledBtn = true;
       this.listData.menuIds = this.getMenuAllCheckedKeys();
-      // this.listData.businessIds = this.getMenuAllCheckedKeysInfo();
+      this.listData.businessIds = this.getMenuAllCheckedKeysInfo();
       var data = this.listData;
       if (this.statusPop === 1) {
         this.$api