Merge branch 'newtang' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into newtang

src/components/tableList.vue

@@ -121,9 +121,7 @@
         width="55"
         header-align="center"
         fixed="left"
-        :selectable="
-          navText.selectableStatus ? navText.selectableFunc : null
-        "
+        :selectable="navText.selectableStatus ? navText.selectableFunc : null"
       >
       </el-table-column>
       <!-- v-if="navText.num" ↓ -->
@@ -674,12 +672,8 @@
                 >{{ scope.row[item.prop3] }}-{{ scope.row[item.prop4] }}</span
               >
             </div>
-            <div>
-              准考证号：{{ scope.row[item.prop5] }}
-            </div>
-            <div>
-              座位号：{{ scope.row[item.prop6] }}
-            </div>
+            <div>准考证号：{{ scope.row[item.prop5] }}</div>
+            <div>座位号：{{ scope.row[item.prop6] }}</div>
             <div>
               同步到考场状态：{{
                 scope.row[item.prop7] === 0
@@ -1433,7 +1427,13 @@
         v-if="navText.xssbStatus"
       >
         <template slot-scope="scope">
-          {{ scope.row.periodPlush ? "已上报" : "未上报" }}
+          <el-popover width="300" trigger="hover">
+            <p>学时推送结果：{{ scope.row.periodPlushMsg || "无" }}</p>
+            <p>官方信息推送结果：{{ scope.row.officialStatusMsg || "无" }}</p>
+            <el-button type="text" slot="reference">{{
+              scope.row.periodPlush ? "已上报" : "未上报"
+            }}</el-button>
+          </el-popover>
         </template>
       </el-table-column>
       <el-table-column

src/views/Marketing/goods/spec/specAdd.vue

@@ -46,7 +46,10 @@
           </div>
         </el-form-item>
         <el-form-item label="名称" prop="name">
-          <el-input v-model.trim="ruleForm.name" style="width: 220px"></el-input>
+          <el-input
+            v-model.trim="ruleForm.name"
+            style="width: 220px"
+          ></el-input>
         </el-form-item>
         <el-form-item label="商品规格" class="eee" prop="specList">
           <div class="spec-title">最多添加两个商品规格类型</div>
@@ -161,7 +164,7 @@ export default {
         changeSpec(this.ruleForm).then((res) => {
           this.isNext = true;
           // this.ruleForm.specTemplateId = res.data[0].specTemplateId;
-          this.getSpecDetail(res.data[0].specTemplateId)
+          this.getSpecDetail(res.data[0].specTemplateId);
           res.data.map((ele) => {
             ele.attrListVos.map((e, i) => {
               ele["value" + i] = e.value;
@@ -188,7 +191,11 @@ export default {
       });
     },
     back() {
-      this.$router.go(-1);
+      this.$store.dispatch("tagsView/exitView", this.$route).then((res) => {
+        this.$router.push({
+          path: "spec",
+        });
+      });
     },
   },
   computed: {},
@@ -205,7 +212,7 @@ export default {
 };
 </script>
 
-<style  lang="scss" scoped>
+<style lang="scss" scoped>
 #specAdd {
   padding-top: 30px;
   .spec-title {
@@ -224,4 +231,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/Marketing/goods/spec/specEdit.vue

@@ -45,7 +45,10 @@
           </div>
         </el-form-item>
         <el-form-item label="名称" prop="name">
-          <el-input v-model.trim="ruleForm.name" style="width: 220px"></el-input>
+          <el-input
+            v-model.trim="ruleForm.name"
+            style="width: 220px"
+          ></el-input>
         </el-form-item>
         <el-form-item label="商品规格" class="eee" prop="specList">
           <div class="spec-title">最多添加两个商品规格类型</div>
@@ -191,7 +194,11 @@ export default {
       });
     },
     back() {
-      this.$router.go(-1);
+      this.$store.dispatch("tagsView/exitView", this.$route).then((res) => {
+        this.$router.push({
+          path: "spec",
+        });
+      });
     },
   },
   computed: {},
@@ -205,7 +212,7 @@ export default {
 };
 </script>
 
-<style  lang="scss" scoped>
+<style lang="scss" scoped>
 #specAdd {
   padding-top: 30px;
   .spec-title {
@@ -224,4 +231,4 @@ export default {
     }
   }
 }
-</style>
+</style>