Tang 1 yıl önce
ebeveyn
işleme
d430e66675

+ 21 - 18
src/components/selectClassModal/index.vue

@@ -7,11 +7,12 @@
       width="800px"
     >
       <div>
-        <el-radio
+        <el-radio-group v-model="gradeValue">
+          <el-radio
           v-for="(item, index) in gradeList"
           :key="index"
           class="radio"
-          v-model="gradeValue"
+          :label="item.gradeId"
           :disabled="
             item.studentNum > 0 && item.studentNum == item.studentUpper
           "
@@ -31,6 +32,8 @@
           </div>
           <div></div
         ></el-radio>
+        </el-radio-group>
+        
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="selectClassOk">确 定</el-button>
@@ -44,14 +47,14 @@ import { mapGetters } from "vuex";
 export default {
   name: "selectClassModal",
   computed: {
-    ...mapGetters(["userInfo"]),
+    ...mapGetters(["userInfo"])
   },
   data() {
     return {
       selectClassModal: false,
       gradeList: [],
       gradeValue: -1,
-      selectItem: {},
+      selectItem: {}
     };
   },
   mounted() {},
@@ -66,7 +69,7 @@ export default {
       if (this.gradeValue == -1) {
         this.$message({
           type: "success",
-          message: "请选择班级",
+          message: "请选择班级"
         });
         return;
       }
@@ -76,21 +79,21 @@ export default {
           gradeId: this.gradeValue,
           oldGradeId: this.selectItem.gradeId,
           orderGoodsId: this.selectItem.orderGoodsId,
-          userId: this.selectItem.userId,
+          userId: this.selectItem.userId
         })
-        .then((res) => {
+        .then(res => {
           this.selectClassModal = false;
           this.$message({
             type: "success",
-            message: "选班成功",
+            message: "选班成功"
           });
 
           this.$emit("selectClassOk");
         })
-        .catch((err) => {
+        .catch(err => {
           this.$message({
             type: "warning",
-            message: err.msg,
+            message: err.msg
           });
         });
     },
@@ -98,35 +101,35 @@ export default {
       let self = this;
       this.$request
         .goodsGradeList({
-          goodsId: id,
+          goodsId: id
         })
-        .then((res) => {
+        .then(res => {
           self.gradeList = res.rows;
           if (self.gradeList.length == 0) {
             let item = {
               className: "系统分班",
-              gradeId: 0,
+              gradeId: 0
             };
             self.gradeList.push(item);
           } else {
             let isGradeFull = self.gradeList.every(
-              (item) =>
+              item =>
                 item.studentNum > 0 && item.studentNum == item.studentUpper
             );
             //所有班级都满了
             if (isGradeFull) {
               let item = {
                 className: "系统分班",
-                gradeId: 0,
+                gradeId: 0
               };
               self.gradeList.unshift(item);
             }
           }
           //自动选中第一个
-          self.gradeValue = self.gradeList[0].gradeId
+          self.gradeValue = self.gradeList[0].gradeId;
         });
-    },
-  },
+    }
+  }
 };
 </script>
 

+ 41 - 37
src/pages/person-center/handle-order/order/step-1/index.vue

@@ -15,7 +15,7 @@
       >
       <span
         >总金额:<i
-          >¥{{ getTotalPrice(apiData.userGoodsList) | formatPrice }}</i
+          ><span style="color:red;">¥{{ getTotalPrice(apiData.userGoodsList) | formatPrice }}</span> </i
         ></span
       >
     </header>
@@ -62,12 +62,8 @@
             apiData.userGoodsList.filter(
               data =>
                 !searchData.searchKey ||
-                data.realname
-                  .toLowerCase()
-                  .includes(searchData.searchKey.toLowerCase()) ||
-                data.idCard
-                  .toLowerCase()
-                  .includes(searchData.searchKey.toLowerCase())
+                data.realname.includes(searchData.searchKey) ||
+                data.idCard.includes(searchData.searchKey)
             )
           "
           style="width: 100%"
@@ -428,37 +424,45 @@ export default {
       this.checkTel = "";
       this.$refs["ruleForm"].validate(valid => {
         if (valid) {
-          let ary = JSON.parse(JSON.stringify(this.apiData));
-          ary.userGoodsList.forEach(i => {
-            i.user = {
-              realname: i.realname,
-              sex: i.sex,
-              idCard: i.idCard,
-              companyName: i.companyName,
-              telphone: i.telphone,
-              eduLevel: i.eduLevel
-            };
-            delete i.realname;
-            delete i.sex;
-            delete i.idCard;
-            delete i.companyName;
-            delete i.telphone;
-            delete i.eduLevel;
-          });
-          this.$request
-            .orderhandle(ary)
-            .then(res => {
-              this.checkTel = "";
-              this.$emit("backData", res.data);
+          this.$confirm("确定提交支付吗?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              let ary = JSON.parse(JSON.stringify(this.apiData));
+              ary.userGoodsList.forEach(i => {
+                i.user = {
+                  realname: i.realname,
+                  sex: i.sex,
+                  idCard: i.idCard,
+                  companyName: i.companyName,
+                  telphone: i.telphone,
+                  eduLevel: i.eduLevel
+                };
+                delete i.realname;
+                delete i.sex;
+                delete i.idCard;
+                delete i.companyName;
+                delete i.telphone;
+                delete i.eduLevel;
+              });
+              this.$request
+                .orderhandle(ary)
+                .then(res => {
+                  this.checkTel = "";
+                  this.$emit("backData", res.data);
+                })
+                .catch(err => {
+                  if (err.code == 439) {
+                    this.checkTel = err.msg;
+                    this.$refs["ruleForm"].validate();
+                  } else {
+                    this.$message.error(err.msg);
+                  }
+                });
             })
-            .catch(err => {
-              if (err.code == 439) {
-                this.checkTel = err.msg;
-                this.$refs["ruleForm"].validate();
-              }else{
-                this.$message.error(err.msg)
-              }
-            });
+            .catch(() => {});
         } else {
           return false;
         }

+ 2 - 0
src/pages/person-center/handle-order/orderDetail.vue

@@ -162,6 +162,8 @@ export default {
       tableData: [],
       tableSet: [
         { label: "姓名", prop: "realname" },
+        { label: "身份证号", prop: "idCard" },
+        { label: "手机号码", prop: "telPhone" },
         { label: "年份", prop: "year" },
         { label: "科目", prop: "subjectNames" },
         { label: "商品", prop: "goodsName" },

+ 1 - 1
src/pages/person-center/index.vue

@@ -128,7 +128,7 @@
                 </router-link>
               </div>
             </div>
-            <div class="nav__section">
+            <div class="nav__section" v-if="false">
               <div class="title">经办订单</div>
               <div class="list">
                 <router-link to="/person-center/handle-order">