ssd

src/components/Study/StudentInfo.vue

@@ -18,8 +18,9 @@
           <span
             v-else-if="item.key == 'classHours'"
             style="color: red; font-weight: bold; font-size: 18px"
-            >{{
-              (userData["finishSectionDuration"] / 60 / 45).toFixed(0)> (secTotalTime / 60 / 45).toFixed(0)? (secTotalTime / 60 / 45).toFixed(0):(userData["finishSectionDuration"] / 60 / 45).toFixed(0)
+            >
+            {{
+             userData["finishSectionDuration"] >secTotalTime? (secTotalTime / 60 / 45).toFixed(0):(userData["finishSectionDuration"] / 60 / 45).toFixed(0)
             }}</span
           ><span
             v-else-if="item.key == 'secTotalTime'"
@@ -175,6 +176,7 @@ export default {
           list.splice(1, 0, { label: "班号：", key: "officialName" });
         }
       }
+      console.log("a", this.userData,this.secTotalTime);
       return list;
     },
     totalTimes: {

src/views/Marketing/order/offlineOrder/batchRecord/firstStep/index.vue

@@ -365,6 +365,7 @@ export default {
      * 科目确定后返回数据
      */
     backObj(obj) {
+      console.log(this.tableData,obj)
       for (let i = 0; i < this.tableData.length; i++) {
         if (this.tableData[i].userId == obj.userId) {
           this.$set(this.tableData[i], "subjectIds", obj.subjectIds);

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

@@ -428,8 +428,9 @@ export default {
   },
   methods: {
     showDetailTech(row){
-      console.log(row)
-         this.$refs.technician.openBoxs(row.subjectNames,row.goodsId,row.artisanData);
+      // console.log(row)
+       var jsondata=JSON.parse(row.artisanData);
+         this.$refs.technician.openBoxs(jsondata.majorName,jsondata.goodsId,jsondata);
     },
     exportorder(){
       let arr = JSON.parse(JSON.stringify(this.formData));

src/views/secondBuild/courseList/index.vue

@@ -336,6 +336,11 @@ export default {
         .commonfreegoodslist(data)
         .then((res) => {
           this.tableData = res.rows;
+           this.tableData.forEach(item=>{
+            if(item.hoursSign==1){
+            item.classHours=item.classHoursStr;
+            }
+          });
           this.total = res.total;
           this.navText.index = res.total;
         })

src/views/secondJian/courseList/index.vue

@@ -324,8 +324,9 @@ export default {
           this.total = res.total;
           this.navText.index = res.total;
           this.tableData.forEach(item=>{
-            if(item.hoursSign==1)
+            if(item.hoursSign==1){
             item.classHours=item.classHoursStr;
+            }
           })
         })
         .finally(() => {

src/views/secondSeven/courseList/index.vue

@@ -321,6 +321,11 @@ export default {
         .commonfreegoodslist(data)
         .then((res) => {
           this.tableData = res.rows;
+          this.tableData.forEach(item=>{
+            if(item.hoursSign==1){
+            item.classHours=item.classHoursStr;
+            }
+          });
           this.total = res.total;
           this.navText.index = res.total;
         })

src/views/secondZao/courseList/index.vue

@@ -321,6 +321,11 @@ export default {
         .commonfreegoodslist(data)
         .then((res) => {
           this.tableData = res.rows;
+          this.tableData.forEach(item=>{
+            if(item.hoursSign==1){
+            item.classHours=item.classHoursStr;
+            }
+          });
           this.total = res.total;
           this.navText.index = res.total;
         })