소스 검색

fix:bug

Tang 3 년 전
부모
커밋
98e2db8e40

+ 2 - 1
src/components/searchBoxNew.vue

@@ -430,6 +430,7 @@
             </el-date-picker>
           </div>
           <el-input
+          :style="item.prop === 'searchKey' ? 'width:260px;' :''"
             v-else-if="!item.scope"
             clearable
             v-model="formData[item.prop]"
@@ -682,7 +683,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") {

+ 16 - 10
src/views/Marketing/goods/courseInquiryList/index.vue

@@ -35,7 +35,7 @@
       :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
-        <div class="leftTitle">我是商品名称</div>
+        <div class="leftTitle">{{goodsBoxName}}</div>
         <div class="rightBoxs">
           <img src="@/assets/images/Close@2x.png" alt="" @click="close" />
         </div>
@@ -248,7 +248,7 @@ export default {
         {
           label: "商品编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "商品名称",
@@ -258,7 +258,7 @@ export default {
         {
           label: "商品状态",
           prop: "status",
-          hidden: true,
+          hidden: false,
           scope: "hasTime",
         },
         {
@@ -284,7 +284,7 @@ export default {
           prop3: "studyStartTime",
           prop4: "studyEndTime",
           scope: "studentServicePeriod",
-          hidden: true,
+          hidden: false,
         },
       ],
       tableData: [], //表单数据
@@ -300,6 +300,7 @@ export default {
       vidzb: "",
       classBox: false,
       goodsId: "",
+      goodsBoxName:"",
     };
   },
   mounted() {
@@ -359,6 +360,7 @@ export default {
         this.formData.pageNum = 1;
       }
       var data = JSON.parse(JSON.stringify(this.formData));
+      data.haveCourse = 1
       this.$api
         .inquireGoods(data)
         .then((res) => {
@@ -377,18 +379,23 @@ export default {
      * 点击详情
      */
     msgInfo(option) {
+      this.goodsBoxName = option.goodsName
       this.$api.obtainCourseSgoodsId(option.goodsId).then(async (res) => {
-        if (res.rows.length) {
+        // if (res.rows.length) {
+        if (!res.rows.length) {
+          this.dialogVisible = true;
+        } else {
           res.rows.forEach((item, index) => {
             item.checked = false;
           });
           this.courseList = res.rows;
           await this.autoGetCourseInfos(res.rows[0], 0);
           this.dialogVisible = true;
-        } else {
-          this.$message.warning("该商品暂无课程");
-          return;
         }
+        // } else {
+        //   this.$message.warning("该商品暂无课程");
+        //   return;
+        // }
       });
     },
     /**
@@ -883,5 +890,4 @@ export default {
   color: purple;
   margin-left: 14px;
 }
-</style>
-
+</style>

+ 4 - 1
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(
                   "自动识别失败,请手动输入发票代码及发票号码"

+ 31 - 27
src/views/education/classManageMent/learningHoursRecordList/index.vue

@@ -209,7 +209,7 @@ export default {
           ],
         },
         {
-          prop: "learnStatus",
+          prop: "periodPlush",
           placeholder: "请选择学时官方推送状态",
           scope: "select",
           noClear: false,
@@ -240,7 +240,7 @@ export default {
         },
         {
           prop: "searchKey",
-          placeholder: "请输入商品编码/商品名称",
+          placeholder: "班级姓名/商品名称/学员姓名/身份证",
         },
       ],
       formData: {
@@ -291,14 +291,14 @@ export default {
           prop: "className",
           hidden: true,
         },
-        {
-          label: "学习服务期",
-          prop1: "serviceStartTime",
-          prop2: "serviceEndTime",
-          hidden: true,
-          Diszing: true,
-          scope: "TimeLists",
-        },
+        // {
+        //   label: "学习服务期",
+        //   prop1: "serviceStartTime",
+        //   prop2: "serviceEndTime",
+        //   hidden: true,
+        //   Diszing: true,
+        //   scope: "TimeLists",
+        // },
         {
           label: "班级有效期",
           prop1: "classStartTime",
@@ -368,10 +368,14 @@ export default {
         },
         {
           label: "学时官方推送状态",
-          prop: "learnStatus",
+          prop: "periodPlush",
           hidden: true,
           scope: "isOptions",
           options: [
+            {
+              label: "否",
+              value: null,
+            },
             {
               label: "否",
               value: 0,
@@ -413,26 +417,26 @@ 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
         .inquireGradegradeListexport(data)
-        .then(async(res) => {
+        .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);
+            if (res.data[k].code === 200) {
+              await this.dowmFunc(res, k);
+            } else {
+              this.$message.error("code值错误:", res.data[k].code);
+            }
           }
-        }
         })
         .catch((err) => {
           /**
@@ -476,8 +480,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);
     },

+ 1 - 1
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>