Browse Source

Merge branch 'five-second-add' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into six

Tang 3 years ago
parent
commit
f3c48dd2e2
44 changed files with 120 additions and 266 deletions
  1. 0 2
      src/views/2Cport/adSlotManagement/tab1.vue
  2. 0 2
      src/views/2Cport/adSlotManagement/tab2.vue
  3. 0 2
      src/views/Marketing/goods/commodityManageMent/edit/index.vue
  4. 0 1
      src/views/Marketing/goods/commodityManageMent/poppleSet.vue
  5. 0 4
      src/views/Marketing/goods/courseInquiryList/index.vue
  6. 0 1
      src/views/Marketing/order/bill/index.vue
  7. 67 20
      src/views/Marketing/order/offlineOrder/batchRecord/secondStep/index.vue
  8. 0 5
      src/views/Marketing/order/offlineOrder/batchRecord/secondStep/setGoodsList.vue
  9. 4 2
      src/views/Marketing/order/offlineOrder/batchRecord/thirdStep/index.vue
  10. 2 0
      src/views/Marketing/order/offlineOrder/goodsMatch/matchInfoData.vue
  11. 1 1
      src/views/Marketing/order/offlineOrder/index.vue
  12. 0 1
      src/views/Marketing/order/offlineOrder/orderChargeInfo/goodsDocument/costPrice.vue
  13. 20 78
      src/views/Marketing/order/offlineOrder/orderChargeInfo/goodsDocument/goodsInfos.vue
  14. 1 1
      src/views/Marketing/order/offlineOrder/orderChargeInfo/topBox.vue
  15. 1 11
      src/views/Marketing/order/offlineOrder/orderDetailsT/index.vue
  16. 0 1
      src/views/Marketing/order/offlineOrder/orderDetailsT/refundDocument/index.vue
  17. 0 1
      src/views/Marketing/order/orderList/add/order/index.vue
  18. 16 75
      src/views/Marketing/order/orderList/details/goodsManage.vue
  19. 0 1
      src/views/education/certificateManagement/creditHoursList/index.vue
  20. 1 1
      src/views/education/classManageMent/learningHoursRecordList/index.vue
  21. 0 1
      src/views/education/classManageMent/learningHoursRecordList/studyTimesRecord.vue
  22. 0 3
      src/views/education/classManageMent/studentMenu/index.vue
  23. 0 7
      src/views/education/dataReview/informationTemplate/index.vue
  24. 0 1
      src/views/education/notificationManageMent/notificationList/index.vue
  25. 1 1
      src/views/education/studentManageMent/studentXQ/BankQuestionPassRecord.vue
  26. 0 1
      src/views/education/studentManageMent/studentXQ/studentBaseManage.vue
  27. 0 1
      src/views/resource/bankManagement/testPaperManagement/editPaper/baseEditPaper/index.vue
  28. 0 2
      src/views/resource/bankManagement/testPaperManagement/editPaper/topicEditPaper/index.vue
  29. 0 1
      src/views/resource/bankManagement/topicManagement/wordPop.vue
  30. 0 6
      src/views/resource/baseManageInfos/index.vue
  31. 0 1
      src/views/resource/baseManageInfos/resource/colleges/index.vue
  32. 0 1
      src/views/resource/videoManagement/chapter/edit/index.vue
  33. 2 2
      src/views/resource/videoManagement/courseManagement/index.vue
  34. 0 2
      src/views/resource/videoManagement/festival/add/index.vue
  35. 4 12
      src/views/resource/videoManagement/festival/edit/index.vue
  36. 0 2
      src/views/resource/videoManagement/flow/index.vue
  37. 0 1
      src/views/system/user/profile/userAvatar.vue
  38. 0 4
      src/views/systemManagement/roleManagement/index.vue
  39. 0 1
      src/views/systemSettings/dict/index.vue
  40. 0 1
      src/views/systemSettings/dictData/index.vue
  41. 0 1
      src/views/systemSettings/menu/index.vue
  42. 0 1
      src/views/systemSettings/personalCenter/index.vue
  43. 0 2
      src/views/systemSettings/roleInfoManagement/index.vue
  44. 0 1
      src/views/systemSettings/usermanagement/index.vue

+ 0 - 2
src/views/2Cport/adSlotManagement/tab1.vue

@@ -386,7 +386,6 @@ export default {
       }
       this.$upload.upload(file, 0).then((res) => {
         this.$set(this.listData, "adverUrl", res);
-        console.log(this.listData);
       });
     },
     /**
@@ -452,7 +451,6 @@ export default {
         this.$api
           .editbaseadvertising(this.listData)
           .then((res) => {
-            console.log(this.listData);
             this.$message.success("修改成功");
             this.dialogVisible = false;
             this.activeFunc(this.activeid);

+ 0 - 2
src/views/2Cport/adSlotManagement/tab2.vue

@@ -415,7 +415,6 @@ export default {
       }
       this.$upload.upload(file, 0).then((res) => {
         this.$set(this.listData, "adverUrl", res);
-        console.log(this.listData);
       });
     },
     /**
@@ -481,7 +480,6 @@ export default {
         this.$api
           .editbaseadvertising(this.listData)
           .then((res) => {
-            console.log(this.listData);
             this.$message.success("修改成功");
             this.dialogVisible = false;
             this.activeFunc(this.activeid);

+ 0 - 2
src/views/Marketing/goods/commodityManageMent/edit/index.vue

@@ -3115,7 +3115,6 @@ export default {
     },
     //视频商品表格函数START
     getInfos(int) {
-      console.log(this.formDatas);
       if (int === 1) {
         this.formDatas.pageNum = 1;
       }
@@ -3153,7 +3152,6 @@ export default {
         // data.businessId = self.listData.businessId;
         this.formDatas.businessId = this.listData.businessId;
       }
-      console.log(this.formDatas);
       this.$api.inquireCourseListS(this.formDatas).then((res) => {
         var aList = [];
         this.tableData.map((item) => {

+ 0 - 1
src/views/Marketing/goods/commodityManageMent/poppleSet.vue

@@ -287,7 +287,6 @@ export default {
                   false
                 );
                 item.courseId = node.data.courseId;
-                console.log(self.auditionListCope, 555825);
                 if (self.auditionListCope) {
                   self.auditionListCope.map((items) => {
                     if (

+ 0 - 4
src/views/Marketing/goods/courseInquiryList/index.vue

@@ -674,10 +674,6 @@ export default {
         document.body.appendChild(myScript);
       } else {
         callback();
-        // this.player.on("serverError", (...params) => {
-        //   this.$message.error(returnTitle(params[1]));
-        //   console.log(params);
-        // });
       }
     },
     loadPlayer() {

+ 0 - 1
src/views/Marketing/order/bill/index.vue

@@ -993,7 +993,6 @@ export default {
           break;
         case 2:
           this.copyData = JSON.parse(JSON.stringify(v));
-          console.log(v, "aaa");
           this.auditData = JSON.parse(JSON.stringify(v));
           this.auditStatus = true;
           break;

+ 67 - 20
src/views/Marketing/order/offlineOrder/batchRecord/secondStep/index.vue

@@ -17,7 +17,7 @@
       <el-table
         v-loading="loading"
         :height="heightData"
-        :data="tableData"
+        :data="filterData(tableData)"
         :span-method="objectSpanMethod"
         border
         style="width: 100%"
@@ -47,7 +47,9 @@
                 }}</span
                 >{{ scope.row[item.prop3] }}
                 <el-button
-                  v-if="toData.templateStatus == 1 && scope.row['goodsType'] == 1"
+                  v-if="
+                    toData.templateStatus == 1 && scope.row['goodsType'] == 1
+                  "
                   type="text"
                   :style="
                     scope.row[item.prop4] === -1 ? 'color:red!important;' : ''
@@ -225,6 +227,11 @@ export default {
     this.getHeightData();
     this.getSujectList();
   },
+  watch: {
+    tableData(val) {
+      this.merage();
+    },
+  },
   computed: {
     compay: function () {
       return function (data, int) {
@@ -279,6 +286,15 @@ export default {
         return arr;
       };
     },
+    filterData: function () {
+      return function (list) {
+        let ary = [];
+        ary = list.filter((item) => {
+          return !item.success;
+        });
+        return ary;
+      };
+    },
   },
   methods: {
     /**
@@ -350,8 +366,33 @@ export default {
     },
     uploadDatas(lists) {
       if (!lists.length) return;
-      let list = lists.sort((a, b) => {
-        return a.goodsType - b.goodsType;
+      let arrays = [];
+      for (let i = 0; i < lists.length; i++) {
+        if (arrays.length) {
+          let aIndex = arrays.findIndex((item) => {
+            return item.subjectId === lists[i].subjectId;
+          });
+          if (aIndex !== -1) {
+            arrays[aIndex].list.push(lists[i]);
+          } else {
+            arrays.push({
+              subjectId: lists[i].subjectId,
+              list: [lists[i]],
+            });
+          }
+        } else {
+          arrays.push({
+            subjectId: lists[i].subjectId,
+            list: [lists[i]],
+          });
+        }
+      }
+      let list = []
+      arrays.forEach((item) => {
+        item.list = item.list.sort((a, b) => {
+          return a.goodsType - b.goodsType;
+        });
+        list.push(...item.list)
       });
       const index = this.tableData.findIndex((item) => {
         return item.realname === list[0].realname;
@@ -363,7 +404,6 @@ export default {
         arr.splice(index, 0, ...list);
         this.tableData = arr;
       }
-      this.merage();
     },
     /**
      * 选择班级
@@ -437,7 +477,11 @@ export default {
     },
     merage() {
       this.merageInit(); // 前文的初始化数据函数
-      for (let i = 0; i < this.tableData.length; i += 1) {
+      let arys = [];
+      arys = this.tableData.filter((item) => {
+        return !item.success;
+      });
+      for (let i = 0; i < arys.length; i += 1) {
         if (i === 0) {
           // 第一行必须存在
           this.typeNameArr.push(1);
@@ -452,7 +496,7 @@ export default {
           // 判断当前元素与上一个元素是否相同,eg:this.typeNamePos 是 this.typeNameArr序号
           // 第一列 下面的是eslint的不限制语法
           // eslint-disable-next-line no-lonely-if
-          if (this.tableData[i].realname === this.tableData[i - 1].realname) {
+          if (arys[i].realname === arys[i - 1].realname) {
             this.typeNameArr[this.typeNamePos] += 1;
             this.typeNameArr.push(0);
           } else {
@@ -461,8 +505,8 @@ export default {
           }
           // 第二列
           if (
-            this.tableData[i].idCard === this.tableData[i - 1].idCard &&
-            this.tableData[i].realname === this.tableData[i - 1].realname
+            arys[i].idCard === arys[i - 1].idCard &&
+            arys[i].realname === arys[i - 1].realname
           ) {
             this.storeArr[this.storePos] += 1;
             this.storeArr.push(0);
@@ -472,9 +516,9 @@ export default {
           }
           // 第三列
           if (
-            this.tableData[i].telphone === this.tableData[i - 1].telphone &&
-            this.tableData[i].idCard === this.tableData[i - 1].idCard &&
-            this.tableData[i].realname === this.tableData[i - 1].realname
+            arys[i].telphone === arys[i - 1].telphone &&
+            arys[i].idCard === arys[i - 1].idCard &&
+            arys[i].realname === arys[i - 1].realname
           ) {
             this.feeArr[this.feePos] += 1;
             this.feeArr.push(0);
@@ -484,10 +528,10 @@ export default {
           }
           // 第四列
           if (
-            this.tableData[i].telphone === this.tableData[i - 1].telphone &&
-            this.tableData[i].idCard === this.tableData[i - 1].idCard &&
-            this.tableData[i].realname === this.tableData[i - 1].realname &&
-            this.tableData[i].subjectId === this.tableData[i - 1].subjectId
+            arys[i].telphone === arys[i - 1].telphone &&
+            arys[i].idCard === arys[i - 1].idCard &&
+            arys[i].realname === arys[i - 1].realname &&
+            arys[i].subjectId === arys[i - 1].subjectId
           ) {
             this.fourArr[this.fourPos] += 1;
             this.fourArr.push(0);
@@ -556,7 +600,12 @@ export default {
               for (let i = 0; i < item.subjectIds.length; i++) {
                 for (let j = 0; j < res.rows.length; j++) {
                   if (res.rows[j].subjectId == item.subjectIds[i]) {
-                    var ary = JSON.parse(JSON.stringify(res.rows[j].goodsList));
+                    var arys = JSON.parse(
+                      JSON.stringify(res.rows[j].goodsList)
+                    );
+                    let ary = arys.sort((a, b) => {
+                      return a.goodsType - b.goodsType;
+                    });
                     var datas = ary.map((items) => {
                       if (obj.topData.type.indexOf(items.goodsType) !== -1) {
                         items.checked = true;
@@ -612,7 +661,6 @@ export default {
         }
       });
       this.tableData = arrays;
-      this.merage();
     },
     backToPage() {
       this.$alert(
@@ -802,7 +850,6 @@ export default {
       let status = newData.every((item) => {
         return item.success === true;
       });
-      console.log(this.tableData, status);
       return status;
     },
     jumpThire() {
@@ -812,7 +859,7 @@ export default {
       var errorList = this.tableData.filter((item) => {
         return item.checked && item.errmsg;
       });
-      this.$parent.changePage2("third", successList, errorList,this.toData);
+      this.$parent.changePage2("third", successList, errorList, this.toData);
       this.disabledBtn = false;
       this.loading = false;
       return;

+ 0 - 5
src/views/Marketing/order/offlineOrder/batchRecord/secondStep/setGoodsList.vue

@@ -193,15 +193,10 @@ export default {
           } else {
             this.newDatas.push(copyData);
           }
-        } else {
-          console.log("不处理");
         }
       } else {
         if (arrStatus !== -1) {
-          console.log(arrStatus, "删除处理");
           this.newDatas.splice(arrStatus, 1);
-        } else {
-          console.log("不处理");
         }
       }
     },

+ 4 - 2
src/views/Marketing/order/offlineOrder/batchRecord/thirdStep/index.vue

@@ -195,7 +195,9 @@ export default {
       sujectList: [],
       successobj: [], //成功数据
       errorobj: [], //失败数据
-      toData: {},
+      toData: {
+        templateStatus:""
+      },
     };
   },
   mounted() {
@@ -536,7 +538,7 @@ export default {
       }
     },
     getInitData(successobj, errorobj, toData) {
-      this.toData = toData;
+      this.toData = JSON.parse(JSON.stringify(toData));
       this.successobj = JSON.parse(JSON.stringify(successobj));
       this.errorobj = JSON.parse(JSON.stringify(errorobj));
       this.tableData = JSON.parse(JSON.stringify(successobj));

+ 2 - 0
src/views/Marketing/order/offlineOrder/goodsMatch/matchInfoData.vue

@@ -269,6 +269,8 @@ export default {
       }
       this.activeType = 1;
       this.goodsNameOrPrice = "";
+      this.goodsName = ""
+      this.getSeachData(1)
       this.disBoxs = true;
     },
     searchGoods(int) {

+ 1 - 1
src/views/Marketing/order/offlineOrder/index.vue

@@ -149,7 +149,7 @@ export default {
         },
         {
           label: "已退总金额",
-          prop: "standPrice",
+          prop: "goodsRefund",
           hidden: true,
           scope: "leftCh",
           ch: "¥",

+ 0 - 1
src/views/Marketing/order/offlineOrder/orderChargeInfo/goodsDocument/costPrice.vue

@@ -266,7 +266,6 @@ export default {
         .then((res) => {
           this.orderList = res.data;
           if (res.data.length) {
-            console.log(res.data, "计费单列表");
             this.getCostInfos(res.data[0].sheetSn);
           }
         });

+ 20 - 78
src/views/Marketing/order/offlineOrder/orderChargeInfo/goodsDocument/goodsInfos.vue

@@ -116,63 +116,25 @@
                 disabled
                 v-else-if="item.scope === 'startEndTime'"
                 v-model="goodsData[item.prop]"
-                type="daterange"
+                type="datetimerange"
+                value-format="timestamp"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+              <el-date-picker
+                :size="size"
+                disabled
+                v-else-if="item.scope === 'studentTime'"
+                v-model="listData['studyTimeArrays']"
+                type="datetimerange"
                 value-format="timestamp"
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
               >
               </el-date-picker>
-              <div v-else-if="item.scope === 'studentTime'">
-                <el-select
-                  disabled
-                  style="width: 150px"
-                  v-model="goodsData.serviceTimeType"
-                  placeholder="请选择学习服务器类型"
-                >
-                  <el-option
-                    v-for="(item, index) in styleType"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <span
-                  v-if="
-                    goodsData.serviceTimeType === 1 ||
-                    goodsData.serviceTimeType === 2 ||
-                    goodsData.serviceTimeType === 3
-                  "
-                  ><span style="margin: 0px 6px">购买那刻开始计算</span
-                  ><el-input
-                    disabled
-                    style="width: 60px"
-                    v-model="goodsData.serviceTimeNum"
-                  ></el-input
-                  ><span style="margin-left: 6px">{{
-                    goodsData.serviceTimeType === 1
-                      ? "年"
-                      : goodsData.serviceTimeType === 2
-                      ? "月"
-                      : goodsData.serviceTimeType === 3
-                      ? "天"
-                      : ""
-                  }}</span></span
-                >
-
-                <el-date-picker
-                  disabled
-                  v-if="goodsData.serviceTimeType === 4"
-                  v-model="goodsData.studyTimeArrays"
-                  type="datetimerange"
-                  value-format="timestamp"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                >
-                </el-date-picker>
-              </div>
               <el-input
                 :size="size"
                 disabled
@@ -271,24 +233,6 @@ export default {
   props: ["goodsId", "orderSn"],
   data() {
     return {
-      styleType: [
-        {
-          label: "按年限",
-          value: 1,
-        },
-        {
-          label: "按月限",
-          value: 2,
-        },
-        {
-          label: "按天限",
-          value: 3,
-        },
-        {
-          label: "按具体时间区间",
-          value: 4,
-        },
-      ],
       size: "",
       tableSet: [
         {
@@ -475,12 +419,6 @@ export default {
           this.$methodsTools.time10to13(res.data.validityStartTime, 2),
           this.$methodsTools.time10to13(res.data.validityEndTime, 2),
         ];
-        if (res.data.serviceTimeType === 4) {
-          res.data.studyTimeArrays = [
-            this.$methodsTools.time10to13(res.data.studyStartTime, 2),
-            this.$methodsTools.time10to13(res.data.studyEndTime, 2),
-          ];
-        }
         res.data.standPriceJson = JSON.parse(res.data.standPriceJson);
         this.goodsData = res.data;
       });
@@ -490,6 +428,10 @@ export default {
           goodsId: this.goodsId,
         })
         .then((res) => {
+          res.data.studyTimeArrays = [
+            this.$methodsTools.time10to13(res.data.serviceStartTime, 2),
+            this.$methodsTools.time10to13(res.data.serviceEndTime, 2),
+          ];
           this.listData = res.data;
           this.$refs["listData"].resetFields();
         });
@@ -503,7 +445,7 @@ export default {
   border-bottom: 1px dotted #9a9a9a;
   margin-bottom: 12px;
 }
-// /deep/ .el-input__inner {
-//   width: 350px;
-// }
+/deep/ .el-input__inner {
+  width: 350px;
+}
 </style>

+ 1 - 1
src/views/Marketing/order/offlineOrder/orderChargeInfo/topBox.vue

@@ -97,7 +97,7 @@ export default {
         },
         {
           label: "已退金额:",
-          prop: "aaa",
+          prop: "goodsRefund",
         },
         {
           label: "录单人:",

+ 1 - 11
src/views/Marketing/order/offlineOrder/orderDetailsT/index.vue

@@ -153,15 +153,7 @@ export default {
             {
               label: "退款中",
               value: 1,
-            },
-            {
-              label: "已退款",
-              value: 2,
-            },
-            {
-              label: "拒绝退款",
-              value: 3,
-            },
+            }
           ],
         },
         {
@@ -440,7 +432,6 @@ export default {
         }
       }
       if (int === 2) {
-        console.log(this.$refs.tableList.allCheckData);
         if (!this.$refs.tableList.allCheckData.length) {
           this.$message.warning("请选择订单");
           return;
@@ -583,7 +574,6 @@ export default {
       this.search(2);
     },
     del(v) {
-      console.log(v);
     },
     handleSizeChange(v) {
       this.formData.pageSize = v;

+ 0 - 1
src/views/Marketing/order/offlineOrder/orderDetailsT/refundDocument/index.vue

@@ -348,7 +348,6 @@ export default {
         .then((res) => {
           //   self.billSendData.invoiceImg = res;
           self.listData[index].applyImgs.push(res);
-          console.log(res);
         })
         .finally(() => {
           self.$refs.file[index].value = "";

+ 0 - 1
src/views/Marketing/order/orderList/add/order/index.vue

@@ -907,7 +907,6 @@ export default {
       });
     },
     changeArea(index, int, value) {
-      console.log(value, "area");
       var opst = [];
       this.cityList.map((item) => {
         if (item.parentId == int) {

+ 16 - 75
src/views/Marketing/order/orderList/details/goodsManage.vue

@@ -108,63 +108,24 @@
                   disabled
                   v-else-if="item.scope === 'startEndTime'"
                   v-model="goodsData[item.prop]"
-                  type="daterange"
+                  type="datetimerange"
+                  value-format="timestamp"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </el-date-picker>
+                <el-date-picker
+                  disabled
+                  v-else-if="item.scope === 'studentTime'"
+                  v-model="listData['studyTimeArrays']"
+                  type="datetimerange"
                   value-format="timestamp"
                   range-separator="至"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                 >
                 </el-date-picker>
-                <div v-else-if="item.scope === 'studentTime'">
-                  <el-select
-                    disabled
-                    style="width: 150px"
-                    v-model="goodsData.serviceTimeType"
-                    placeholder="请选择学习服务器类型"
-                  >
-                    <el-option
-                      v-for="(item, index) in styleType"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                  <span
-                    v-if="
-                      goodsData.serviceTimeType === 1 ||
-                      goodsData.serviceTimeType === 2 ||
-                      goodsData.serviceTimeType === 3
-                    "
-                    ><span style="margin: 0px 6px">购买那刻开始计算</span
-                    ><el-input
-                      disabled
-                      style="width: 60px"
-                      v-model="goodsData.serviceTimeNum"
-                    ></el-input
-                    ><span style="margin-left: 6px">{{
-                      goodsData.serviceTimeType === 1
-                        ? "年"
-                        : goodsData.serviceTimeType === 2
-                        ? "月"
-                        : goodsData.serviceTimeType === 3
-                        ? "天"
-                        : ""
-                    }}</span></span
-                  >
-
-                  <el-date-picker
-                    disabled
-                    v-if="goodsData.serviceTimeType === 4"
-                    v-model="goodsData.studyTimeArrays"
-                    type="datetimerange"
-                    value-format="timestamp"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                  >
-                  </el-date-picker>
-                </div>
                 <el-input
                   disabled
                   v-else-if="item.scope === 'yecj'"
@@ -258,24 +219,6 @@ import { mapGetters } from "vuex";
 export default {
   data() {
     return {
-      styleType: [
-        {
-          label: "按年限",
-          value: 1,
-        },
-        {
-          label: "按月限",
-          value: 2,
-        },
-        {
-          label: "按天限",
-          value: 3,
-        },
-        {
-          label: "按具体时间区间",
-          value: 4,
-        },
-      ],
       ISADMIN: true,
       tableSet: [
         {
@@ -474,12 +417,6 @@ export default {
           this.$methodsTools.time10to13(res.data.validityStartTime, 2),
           this.$methodsTools.time10to13(res.data.validityEndTime, 2),
         ];
-        if (res.data.serviceTimeType === 4) {
-          res.data.studyTimeArrays = [
-            this.$methodsTools.time10to13(res.data.studyStartTime, 2),
-            this.$methodsTools.time10to13(res.data.studyEndTime, 2),
-          ];
-        }
         res.data.standPriceJson = JSON.parse(res.data.standPriceJson);
         this.goodsData = res.data;
       });
@@ -489,6 +426,10 @@ export default {
           goodsId: this.$route.query.goodsId,
         })
         .then((res) => {
+          res.data.studyTimeArrays = [
+            this.$methodsTools.time10to13(res.data.serviceStartTime, 2),
+            this.$methodsTools.time10to13(res.data.serviceEndTime, 2),
+          ];
           this.listData = res.data;
           this.$refs["listData"].resetFields();
         });

+ 0 - 1
src/views/education/certificateManagement/creditHoursList/index.vue

@@ -195,7 +195,6 @@ export default {
         };
       });
       this.filesToRar(arr, "证书批量下载");
-      console.log(arr);
     },
     filesToRar(arrImages, filename) {
       let _this = this;

+ 1 - 1
src/views/education/classManageMent/learningHoursRecordList/index.vue

@@ -244,7 +244,7 @@ export default {
         },
         {
           prop: "searchKey",
-          placeholder: "班级名/商品名称/学员姓名/身份证",
+          placeholder: "班级名/商品名称/学员姓名/身份证",
         },
       ],
       formData: {

+ 0 - 1
src/views/education/classManageMent/learningHoursRecordList/studyTimesRecord.vue

@@ -1743,7 +1743,6 @@ export default {
     //获取用户信息
     getUserInfo() {
       return new Promise((resolve, reject) => {
-        console.log(this.objs);
         this.$api
           .inquireGradegradelistUserlistPeriod({
             gradeId: this.objs.id,

+ 0 - 3
src/views/education/classManageMent/studentMenu/index.vue

@@ -773,9 +773,6 @@ export default {
         }
       });
     },
-    getInfos(e) {
-      console.log(e);
-    },
     getStatus() {
       return new Promise((resolve, reject) => {
         this.$api

+ 0 - 7
src/views/education/dataReview/informationTemplate/index.vue

@@ -1169,7 +1169,6 @@ export default {
           }
         });
         this.cauType = newArr;
-        console.log(this.cauType);
         if (this.cauType.length) {
           this.isIndeterminate = true;
         } else {
@@ -1302,7 +1301,6 @@ export default {
         .then((res) => {
           if (v.goodsIds) {
             this.disCheckList = v.goodsIds.split(",").map(Number);
-            console.log(this.disCheckList);
           } else {
             this.disCheckList = [];
           }
@@ -1378,9 +1376,6 @@ export default {
         item.checked = true;
         this.pzList1sss.push(item);
       }
-      this.$nextTick(() => {
-        console.log(this.pzList1sss, 123);
-      });
     },
     changeStatus1s(item, index) {
       if (item.required) {
@@ -1515,7 +1510,6 @@ export default {
         }
         return item.fieldKey === "commitment_seal";
       });
-      console.log(data);
       this.pzList2 = data;
       this.dialogVisibleLitsing2 = true;
     },
@@ -1530,7 +1524,6 @@ export default {
       }
       this.listData.keyValue2 = this.pzList2sss;
       this.dialogVisibleLitsing2 = false;
-      console.log(this.pzList2sss);
     },
     getMessage() {
       if (!this.eduType) {

+ 0 - 1
src/views/education/notificationManageMent/notificationList/index.vue

@@ -605,7 +605,6 @@ export default {
       this.addClickFLs(v, 6);
     },
     handleNodeClick(node) {
-      console.log(node);
     },
     getNewInfo() {
       this.$api.inquiresystemclassifylist({ status: 1 }).then((res) => {

+ 1 - 1
src/views/education/studentManageMent/studentXQ/BankQuestionPassRecord.vue

@@ -576,7 +576,7 @@ export default {
           width: "140px",
         },
         {
-          label: "学习有效期",
+          label: "学习服务期",
           prop1: "serviceStartTime",
           prop2: "serviceEndTime",
           scope: "moreTime",

+ 0 - 1
src/views/education/studentManageMent/studentXQ/studentBaseManage.vue

@@ -352,7 +352,6 @@ export default {
         .inquiregradestudentlistStudent({ userId: this.$route.query.id })
         .then((res) => {
           this.listData = res.rows[0];
-          console.log(res);
         });
     },
     backPage() {

+ 0 - 1
src/views/resource/bankManagement/testPaperManagement/editPaper/baseEditPaper/index.vue

@@ -229,7 +229,6 @@ export default {
     this.$api
       .gradecheckGoodsChange({ chapterExamId: this.$route.query.id })
       .then((res) => {
-        console.log(res.data);
         if (res.data > 0) {
           this.noStudent = false;
         }

+ 0 - 2
src/views/resource/bankManagement/testPaperManagement/editPaper/topicEditPaper/index.vue

@@ -1147,7 +1147,6 @@ export default {
             item.optionsList = JSON.parse(item.jsonStr);
             item.index = index;
           });
-          console.log(res.data);
           this.copytableData = JSON.parse(JSON.stringify(res.data));
           this.boxtableDataPags = JSON.parse(JSON.stringify(res.data));
           this.tableData = res.data;
@@ -1468,7 +1467,6 @@ export default {
       //   this.$message.warning("请选择业务层级");
       //   return;
       // }
-      // console.log(this.$refs.sujects)
       this.BusNameList = [];
       this.BusName = "";
       this.dialogVisible = true;

+ 0 - 1
src/views/resource/bankManagement/topicManagement/wordPop.vue

@@ -148,7 +148,6 @@ export default {
             this.formData.projectId = this.newBusinessLevel[i].projectId;
             break;
           }
-          console.log(1);
         }
       }
       this.formData.subjectId = "";

+ 0 - 6
src/views/resource/baseManageInfos/index.vue

@@ -90,12 +90,6 @@ export default {
       ],
     };
   },
-  mounted() {
-    let msg = '123'
-    msg ||= 'abc'
-
-    console.log(msg);
-  },
   methods: {
     jumpPages() {
       this.$router.push({

+ 0 - 1
src/views/resource/baseManageInfos/resource/colleges/index.vue

@@ -338,7 +338,6 @@ export default {
       }
     },
     changeJYList() {
-      console.log(this.listData)
       if (this.listData.schoolCityId) {
         this.listData.schoolCityId = "";
       }

+ 0 - 1
src/views/resource/videoManagement/chapter/edit/index.vue

@@ -618,7 +618,6 @@ export default {
     this.$api
       .gradecheckGoodsChange({ chapterId: this.$route.query.id })
       .then((res) => {
-        console.log(res.data);
         if (res.data > 0) {
           this.noStudent = false;
         }

+ 2 - 2
src/views/resource/videoManagement/courseManagement/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="moduleManagement">
+  <div id="courseManagement">
     <search-box-new
       ref="searchBox"
       :formData="formData"
@@ -41,7 +41,7 @@ import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
-  name: "ModuleManagement",
+  name: "CourseManagement",
   components: { searchBoxNew, tableList, pagination },
   data() {
     return {

+ 0 - 2
src/views/resource/videoManagement/festival/add/index.vue

@@ -591,7 +591,6 @@ export default {
         callback();
         this.player.on("serverError", (...params) => {
           this.$message.error(returnTitle(params[1]));
-          console.log(params);
         });
       }
     },
@@ -680,7 +679,6 @@ export default {
       var file = event.target.files[0];
       // let formData = new FormData();
       // formData.append("file", file);
-      // console.log(formData);
       if (!event.target.value) {
         this.$message.error("请选择您要上传的文件");
         return false;

+ 4 - 12
src/views/resource/videoManagement/festival/edit/index.vue

@@ -497,7 +497,7 @@ export default {
       return arrays;
     },
     /**
-     * 
+     *
      * @param {Arrays} val 复选框数据
      * @remards 复选框全选触发
      */
@@ -565,7 +565,6 @@ export default {
         callback();
         this.player.on("serverError", (...params) => {
           this.$message.error(returnTitle(params[1]));
-          console.log(params);
         });
       }
     },
@@ -627,12 +626,9 @@ export default {
         document.body.appendChild(myScript);
       } else {
         callback();
-        // this.playerzb.on("serverError", (...err) => {
-        //   console.log(err, 321);
-        // });
       }
     },
-    
+
     loadPlayerzb() {
       const polyvLivePlayer = window.polyvLivePlayer;
       this.playerzb = polyvLivePlayer({
@@ -654,11 +650,7 @@ export default {
     },
     /**上传视频 */
     importMoble(event) {
-      // var self = this;
       var file = event.target.files[0];
-      // let formData = new FormData();
-      // formData.append("file", file);
-      // console.log(formData);
       if (!event.target.value) {
         this.$message.error("请选择您要上传的文件");
         return false;
@@ -955,8 +947,8 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (!this.newSujectApis.length) {
-            this.$message.error("请选择适用业务层级")
-            return
+            this.$message.error("请选择适用业务层级");
+            return;
           }
           // if (
           //   this.listData.coverUrl === "" ||

+ 0 - 2
src/views/resource/videoManagement/flow/index.vue

@@ -626,7 +626,6 @@ export default {
           }
         });
         this.cauType = newArr;
-        console.log(this.cauType);
         if (this.cauType.length) {
           this.isIndeterminate = true;
         } else {
@@ -647,7 +646,6 @@ export default {
       this.disabledBtn = false;
     },
     loadNode(node, resolve) {
-      console.log(node);
       if (node.level === 0) {
         this.$api.obtainpolyvvideosignlistCata({ parentid: 0 }).then((res) => {
           return resolve(res.rows);

+ 0 - 1
src/views/system/user/profile/userAvatar.vue

@@ -159,7 +159,6 @@ export default {
     },
     // 上传图片
     uploadImg() {
-      // console.log(store.getters.userId,store.getters.name)
       this.$refs.cropper.getCropBlob((data) => {
         this.$upload.upload(data, 0).then((res) => {
           var items = {

+ 0 - 4
src/views/systemManagement/roleManagement/index.vue

@@ -585,14 +585,12 @@ export default {
     },
     // 树权限(全选/全不选)
     handleCheckedTreeNodeAll(value, type) {
-      console.log(this.$refs.menu);
       if (type == "menu") {
         this.$refs.menu[0].setCheckedNodes(value ? this.menuOptions : []);
       }
     },
     // 数据池树权限(展开/折叠)
     handleCheckedTreeExpandInfo(value, type) {
-      console.log(this.$refs.info);
       if (type == "info") {
         let treeList = this.menuOptionsInfo;
         for (let i = 0; i < treeList.length; i++) {
@@ -603,7 +601,6 @@ export default {
     },
     // 数据池树权限(全选/全不选)
     handleCheckedTreeNodeAllInfo(value, type) {
-      console.log(this.$refs.info);
       if (type == "info") {
         this.$refs.info[0].setCheckedNodes(value ? this.menuOptionsInfo : []);
       }
@@ -611,7 +608,6 @@ export default {
     // 树权限(父子联动)
     handleCheckedTreeConnect(value, type) {
       if (type == "menu") {
-        console.log(value);
         this.listData.menuCheckStrictly = value ? true : false;
       }
     },

+ 0 - 1
src/views/systemSettings/dict/index.vue

@@ -230,7 +230,6 @@ export default {
   },
   methods: {
     search(v) {
-      console.log(v);
       if (v === undefined) {
         v = {
           statusArray: "0,1",

+ 0 - 1
src/views/systemSettings/dictData/index.vue

@@ -249,7 +249,6 @@ export default {
   },
   methods: {
     search(v) {
-      console.log(this.paramsData);
       if (v === undefined) {
         v = {
           statusArray: "0,1",

+ 0 - 1
src/views/systemSettings/menu/index.vue

@@ -396,7 +396,6 @@ export default {
       if (row.menuType == "F") {
         return "";
       }
-      // console.log(this.statusOptions,row);
 
       return this.selectDictLabel(this.statusOptions, row.status);
     },

+ 0 - 1
src/views/systemSettings/personalCenter/index.vue

@@ -114,7 +114,6 @@ export default {
         return;
       }
       if (!testPhone.test(this.bfdata.phonenumber)) {
-        console.log(this.bfdata);
         this.$message.error("请输入正确手机号");
         return;
       }

+ 0 - 2
src/views/systemSettings/roleInfoManagement/index.vue

@@ -465,7 +465,6 @@ export default {
     },
     // 树权限(全选/全不选)
     handleCheckedTreeNodeAll(value, type) {
-      console.log(this.$refs.menu);
       if (type == "menu") {
         this.$refs.menu[0].setCheckedNodes(value ? this.menuOptions : []);
       }
@@ -473,7 +472,6 @@ export default {
     // 树权限(父子联动)
     handleCheckedTreeConnect(value, type) {
       if (type == "menu") {
-        console.log(value);
         this.listData.menuCheckStrictly = value ? true : false;
       }
     },

+ 0 - 1
src/views/systemSettings/usermanagement/index.vue

@@ -488,7 +488,6 @@ export default {
     },
     //初始数据
     getOptionsRole() {
-      console.log(this.dictManages);
       var data = {
         statusArray: "0,1",
       };