fix:合并

src/components/searchBoxNew.vue

@@ -457,6 +457,7 @@
             </el-date-picker>
           </div>
           <el-input
+          :style="item.prop === 'searchKey' ? 'width:260px;' :''"
             v-else-if="!item.scope"
             clearable
             v-model="formData[item.prop]"
@@ -725,7 +726,7 @@ export default {
             }
           } else {
             if (items.diff === "gfxs") {
-              if (this.formData["studyStatus"] == 2) {
+              if (this.formData["studyStatus"] == 2 && this.formData["periodStatus"] == 1) {
                 return items;
               }
             } else if (items.diff === "ksdd") {

src/views/Marketing/goods/courseInquiryList/index.vue

@@ -890,5 +890,4 @@ export default {
   color: purple;
   margin-left: 14px;
 }
-</style>
-
+</style>

src/views/Marketing/order/bill/index.vue

@@ -1056,7 +1056,10 @@ export default {
                   );
                 }
                 self.billSendData.invoiceCode = result.data.invoiceCode;
-                self.billSendData.invoiceNum = result.data.invoiceNum;
+                self.billSendData.invoiceNum = result.data.invoiceNum.replace(
+                  "No",
+                  ""
+                );
               } else {
                 self.$message.error(
                   "自动识别失败，请手动输入发票代码及发票号码"

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

@@ -213,7 +213,7 @@ export default {
           ],
         },
         {
-          prop: "learnStatus",
+          prop: "periodPlush",
           placeholder: "请选择学时官方推送状态",
           scope: "select",
           noClear: false,
@@ -244,7 +244,7 @@ export default {
         },
         {
           prop: "searchKey",
-          placeholder: "请输入商品编码/商品名称",
+          placeholder: "班级姓名/商品名称/学员姓名/身份证",
         },
       ],
       formData: {
@@ -295,14 +295,14 @@ export default {
           prop: "className",
           hidden: true,
         },
-        {
-          label: "学习服务期",
-          prop1: "serviceStartTime",
-          prop2: "serviceEndTime",
-          hidden: false,
-          Diszing: true,
-          scope: "TimeLists",
-        },
+        // {
+        //   label: "学习服务期",
+        //   prop1: "serviceStartTime",
+        //   prop2: "serviceEndTime",
+        //   hidden: true,
+        //   Diszing: true,
+        //   scope: "TimeLists",
+        // },
         {
           label: "班级有效期",
           prop1: "classStartTime",
@@ -372,10 +372,14 @@ export default {
         },
         {
           label: "学时官方推送状态",
-          prop: "learnStatus",
-          hidden: false,
+          prop: "periodPlush",
+          hidden: true,
           scope: "isOptions",
           options: [
+            {
+              label: "否",
+              value: null,
+            },
             {
               label: "否",
               value: 0,
@@ -417,14 +421,14 @@ export default {
       /**
        * @remards 学习状态为2的话 需要勾选学时官方推送状态
        */
-      if (
-        data.studyStatus === 2 &&
-        data.officialStatus !== 0 &&
-        data.officialStatus !== 1
-      ) {
-        this.$message.warning("请选择学时官方推送状态");
-        return;
-      }
+      // if (
+      //   data.studyStatus === 2 &&
+      //   data.officialStatus !== 0 &&
+      //   data.officialStatus !== 1
+      // ) {
+      //   this.$message.warning("请选择学时官方推送状态");
+      //   return;
+      // }
       this.disabledBtn = true;
       this.$modal.loading("正在导出数据，请稍后...");
       this.$api
@@ -480,8 +484,8 @@ export default {
         searchKey: this.formData.searchKey || "",
         searchStartTime: this.formData.searchStartTime / 1000 || "",
         searchEndTime: this.formData.searchEndTime / 1000 || "",
-        officialStatus:
-          this.formData.studyStatus === 2 ? this.formData.learnStatus : "",
+        // officialStatus:
+        //   this.formData.studyStatus === 2 ? this.formData.learnStatus : "",
       };
       this.exputs(data);
     },

src/views/education/dataReview/dataConfig/index.vue

@@ -567,19 +567,13 @@ export default {
       this.$modal.loading("正在导出数据，请稍后...");
       this.$api
         .inquirebaseprofileExport(data)
-        .then((res) => {
-          if (res.code === 200) {
-            let url = baseUrls.baseURL + "common/download?fileName=" + res.msg;
-            let link = document.createElement("a");
-            let fileName = "导出数据" + ".xlsx";
-            document.body.appendChild(link);
-            link.dowmload = fileName;
-            link.href = url;
-            console.log(link);
-            link.click();
-            link.remove();
-            this.$message.success("批量导出成功");
-            this.dialogDR = false;
+        .then(async (res) => {
+          for (let k in res.data) {
+            if (res.data[k].code === 200) {
+              await this.dowmFunc(res, k);
+            } else {
+              this.$message.error("code值错误：", res.data[k].code);
+            }
           }
         })
         .catch((err) => {
@@ -594,6 +588,22 @@ export default {
           this.$modal.closeLoading();
         });
     },
+    dowmFunc(res, k) {
+      return new Promise((resolve, reject) => {
+        let url =
+          baseUrls.baseURL + "common/download?fileName=" + res.data[k].msg;
+        let link = document.createElement("a");
+        let fileName = "导入模板" + ".xlsx";
+        document.body.appendChild(link);
+        link.href = url;
+        link.dowmload = fileName;
+        link.click();
+        link.remove();
+        setTimeout(() => {
+          resolve();
+        }, 200);
+      });
+    },
     moreActive() {
       let data = {
         changeStatus: this.formData.changeStatus || "",

src/views/education/dataReview/stamp/index.vue

@@ -475,18 +475,13 @@ export default {
       this.$modal.loading("正在导出数据，请稍后...");
       this.$api
         .inquirebaseprofileStampexport(data)
-        .then((res) => {
-          if (res.code === 200) {
-            let url = baseUrls.baseURL + "common/download?fileName=" + res.msg;
-            let link = document.createElement("a");
-            let fileName = "导出数据" + ".xlsx";
-            document.body.appendChild(link);
-            link.href = url;
-            link.dowmload = fileName;
-            link.click();
-            link.remove();
-            this.$message.success("批量导出成功");
-            this.dialogDR = false;
+        .then(async (res) => {
+          for (let k in res.data) {
+            if (res.data[k].code === 200) {
+              await this.dowmFunc(res, k);
+            } else {
+              this.$message.error("code值错误：", res.data[k].code);
+            }
           }
         })
         .catch((err) => {
@@ -501,6 +496,22 @@ export default {
           this.$modal.closeLoading();
         });
     },
+    dowmFunc(res, k) {
+      return new Promise((resolve, reject) => {
+        let url =
+          baseUrls.baseURL + "common/download?fileName=" + res.data[k].msg;
+        let link = document.createElement("a");
+        let fileName = "导入模板" + ".xlsx";
+        document.body.appendChild(link);
+        link.href = url;
+        link.dowmload = fileName;
+        link.click();
+        link.remove();
+        setTimeout(() => {
+          resolve();
+        }, 200);
+      });
+    },
     moreActive() {
       let data = {
         changeStatus: this.formData.changeStatus || "",

src/views/resource/videoManagement/chapter/add/index.vue

@@ -249,6 +249,14 @@
                   ? "回放"
                   : "未知"
               }}</span>
+              <span v-else-if="item.scope === 'convert'">{{
+                $methodsTools.secondToDate(scope.row[item.prop], false)
+              }}</span>
+              <span v-else-if="item.scope === 'liveAndUrl'">{{
+                scope.row[item.prop] == 2
+                  ? scope.row[item.prop2]
+                  : scope.row[item.prop1]
+              }}</span>
               <span v-else-if="item.scope === 'Status'">
                 {{
                   scope.row[item.prop] === 1
@@ -364,6 +372,14 @@
                   ? "回放"
                   : ""
               }}</span>
+              <span v-else-if="item.scope === 'convert'">{{
+                $methodsTools.secondToDate(scope.row[item.prop], false)
+              }}</span>
+              <span v-else-if="item.scope === 'liveAndUrl'">{{
+                scope.row[item.prop] == 2
+                  ? scope.row[item.prop2]
+                  : scope.row[item.prop1]
+              }}</span>
               <span v-else-if="item.scope === 'Status'">
                 {{
                   scope.row[item.prop] === 1
@@ -540,6 +556,21 @@ export default {
         { label: "标题前缀", prop: "prefixName", width: "180" },
         { label: "节标题", prop: "name", width: "310" },
         { label: "节类型", prop: "sectionType", scope: "types" },
+        {
+          label: "URL地址/直播地址",
+          prop: "sectionType",
+          prop1: "recordingUrl",
+          prop2: "liveUrl",
+          width: "310",
+          hidden: true,
+          scope: "liveAndUrl",
+        },
+        {
+          label: "节时长",
+          prop: "durationTime",
+          hidden: true,
+          scope: "convert",
+        },
         {
           label: "发布状态",
           prop: "publishStatus",

src/views/resource/videoManagement/chapter/edit/index.vue

@@ -221,6 +221,14 @@
                   ? "回放"
                   : "未知"
               }}</span>
+              <span v-else-if="item.scope === 'convert'">{{
+                $methodsTools.secondToDate(scope.row[item.prop], false)
+              }}</span>
+              <span v-else-if="item.scope === 'liveAndUrl'">{{
+                scope.row[item.prop] == 2
+                  ? scope.row[item.prop2]
+                  : scope.row[item.prop1]
+              }}</span>
               <span v-else-if="item.scope === 'Status'">
                 {{
                   scope.row[item.prop] === 1
@@ -336,6 +344,14 @@
                   ? "回放"
                   : ""
               }}</span>
+              <span v-else-if="item.scope === 'convert'">{{
+                $methodsTools.secondToDate(scope.row[item.prop], false)
+              }}</span>
+              <span v-else-if="item.scope === 'liveAndUrl'">{{
+                scope.row[item.prop] == 2
+                  ? scope.row[item.prop2]
+                  : scope.row[item.prop1]
+              }}</span>
               <span v-else-if="item.scope === 'Status'">
                 {{
                   scope.row[item.prop] === 1
@@ -511,6 +527,21 @@ export default {
         { label: "标题前缀", prop: "prefixName", width: "180" },
         { label: "节标题", prop: "name", width: "310" },
         { label: "节类型", prop: "sectionType", scope: "types" },
+        {
+          label: "URL地址/直播地址",
+          prop: "sectionType",
+          prop1: "recordingUrl",
+          prop2: "liveUrl",
+          width: "310",
+          hidden: true,
+          scope: "liveAndUrl",
+        },
+        {
+          label: "节时长",
+          prop: "durationTime",
+          hidden: true,
+          scope: "convert",
+        },
         {
           label: "发布状态",
           prop: "publishStatus",
@@ -1002,8 +1033,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 === "" ||

src/views/systemManagement/auditManagement/assignReviewers/index.vue

@@ -8,7 +8,7 @@
       </div>
     </div>
     <div class="floatSty">
-      <div class="headsty">班级管理</div>
+      <div class="headsty">网课学习管理</div>
       <div class="dis_sty">
         <div class="btnSty" @click="getInfo(2)">学时审核</div>
       </div>