页面修改

src/components/editor/UeEditor.vue

@@ -102,7 +102,6 @@
       },
       //选择文件弹窗
       attachmentSelected(fileArray) {
- 
         if (fileArray&&fileArray.length) {
           let html = '';
           //图片
@@ -144,8 +143,8 @@
           }
           if(this.uploadType==3)
           {
-              for (let i in e) {
-              var type = e[i].fileName.split('.')[1];
+              for (let i in fileArray) {
+              var type = fileArray[i].fileName.split('.')[1];
               var imgUrl = "";
               var dataName = "";
               if (type == 'xlsx' || type == 'xls') {

src/components/question/question-form.vue

@@ -284,8 +284,8 @@
         default: null
       },
       CourseId: {
-        type: String, //课程编号
-        default: "0",
+        type: Number, //课程编号
+        default: 0,
       },
       BankId: {
         type: String, //题库编号

src/components/sale/orderlist.vue

@@ -811,10 +811,13 @@
       },
       //跳转到学生名单
       gostudent(item) {
-        var tempStr = '/sale/studentList?OrderId=' + item.OrderId + '&ClassId=' + item.ClassId;
+        var tempStr = '/sale/studentList';
         this.$router.push({
           path: tempStr,
           query: {
+            OrderId:item.OrderId,
+            ClassId:item.ClassId,
+            SourceId:item.SourceId,
             isShow: this.AuthorityObj.isShowGuestBtn
           }
         });

src/pages/sale/studentList.vue

@@ -2,7 +2,7 @@
   <div class="page-body">
     <div class="page-content">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
-        separator="none" :data="data" :columns="columns" row-key="name">
+        separator="none" :data="data" :columns="columns" row-key="name" :visible-columns="visibleColumns">
         <template v-slot:top="props">
           <div class="col-2 q-table__title" @click="goreturn" style="cursor:pointer">返回</div>
           <q-space />
@@ -35,46 +35,66 @@
           <div class="text-h6">{{addMsg.Id==0?'新增学员':'修改学员'}}</div>
         </q-card-section>
         <div class="text-caption q-mb-lg q-px-md text-grey-6">基础信息</div>
-        <q-card-section class="q-pt-none">
+        <q-card-section class="q-pt-none" v-if="msg.ClassId>0">
           <div class="row wrap">
-            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg"
-              v-model="addMsg.GuestName" label="姓名" :rules="[val => !!val || '姓名']" />
-            <q-input clearable filled class="col-6 q-pb-lg"
-              v-model="addMsg.Profession" label="职业" :rules="[val => !!val || '职业']" />
+            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" v-model="addMsg.GuestName" label="姓名"
+              :rules="[val => !!val || '姓名']" />
+            <q-input clearable filled class="col-6 q-pb-lg" v-model="addMsg.Profession" label="职业"
+              :rules="[val => !!val || '职业']" />
             <div class="col-6 q-pb-lg">
               <q-radio v-model="addMsg.Sex" val="1" label="男" />
               <q-radio v-model="addMsg.Sex" val="2" label="女" />
             </div>
-            <q-input clearable filled class="col-6 q-pb-lg"
-              v-model="addMsg.Age" label="年龄" :rules="[val => !!val || '年龄']" />
-            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg"
-              v-model="addMsg.Mobile" label="电话" :rules="[val => !!val || '电话']" type="number" />
-            <q-select class="col-6 q-pb-lg" option-value="Name" standout="bg-primary text-white"
-              option-label="Name" v-model="addMsg.Basics" :options="GBList" emit-value map-options label="语音基础"
-              use-input new-value-mode="add-unique" hint="自己输入语音基础的话，输入之后按回车！" />
+            <q-input clearable filled class="col-6 q-pb-lg" v-model="addMsg.Age" label="年龄"
+              :rules="[val => !!val || '年龄']" />
+            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" v-model="addMsg.Mobile" label="电话"
+              :rules="[val => !!val || '电话']" type="number" />
+            <q-select class="col-6 q-pb-lg" option-value="Name" standout="bg-primary text-white" option-label="Name"
+              v-model="addMsg.Basics" :options="GBList" emit-value map-options label="语言基础" use-input
+              new-value-mode="add-unique" hint="自己输入语言基础的话，输入之后按回车！" />
             <q-select class="col-6 q-pb-lg q-pr-lg" option-value="Id" standout="bg-primary text-white"
               option-label="Name" v-model="addMsg.Education" :options="GEList" emit-value map-options label="最高学历" />
-            <q-select class="col-6 q-pb-lg" option-value="Id" standout="bg-primary text-white"
-              option-label="Name" v-model="addMsg.LearningGoals" :options="GLList" emit-value map-options
-              label="学习目的" />
+            <q-select class="col-6 q-pb-lg" option-value="Id" standout="bg-primary text-white" option-label="Name"
+              v-model="addMsg.LearningGoals" :options="GLList" emit-value map-options label="学习目的" />
             <q-select class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" option-value="Id"
               option-label="Name" v-model="addMsg.GuestSource" :options="OFList" emit-value map-options label="客人来源" />
-            <q-input clearable filled class="col-6 q-pb-lg"
-            v-model="addMsg.ContactAddress" label="现居住地址" />
+            <q-input clearable filled class="col-6 q-pb-lg" v-model="addMsg.ContactAddress" label="现居住地址" />
           </div>
         </q-card-section>
-        <div class="text-caption q-mb-lg q-px-md text-grey-6">附加信息</div>
-        <div class="row wrap" style="margin:0 20px;">
-          <q-input clearable filled class="col-6 q-pb-lg q-pr-lg"
-            v-model="addMsg.IDCard" label="身份证" />
-          <q-input clearable filled class="col-6 q-pb-lg"
-            v-model="addMsg.Domicile" label="身份证居住地" />
+        <q-card-section class="q-pt-none" v-if="msg.SourceId>0">
+          <div class="row wrap">
+            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" v-model="addMsg.GuestName" label="姓名"
+              :rules="[val => !!val || '姓名']" />
+            <div class="col-6 q-pb-lg">
+              <q-radio v-model="addMsg.Sex" val="1" label="男" />
+              <q-radio v-model="addMsg.Sex" val="2" label="女" />
+            </div>
+            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" v-model="addMsg.Age" label="年龄"
+              :rules="[val => !!val || '年龄']" />
+            <q-input clearable filled class="col-6 q-pb-lg" v-model="addMsg.Mobile" label="电话"
+              :rules="[val => !!val || '电话']" type="number" />
+            <q-select class="col-6 q-pb-lg q-pr-lg" option-value="Name" standout="bg-primary text-white"
+              option-label="Name" v-model="addMsg.Basics" :options="GBList" emit-value map-options label="日语水平"
+              use-input new-value-mode="add-unique" hint="自己输入日语水平的话，输入之后按回车！" />
+            <q-input clearable filled class="col-6 q-pb-lg" v-model="addMsg.GraduatedSchool" label="毕业院校" />
+            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" v-model="addMsg.GraduatedMajor" label="毕业专业" />
+            <q-input clearable filled class="col-6 q-pb-lg" v-model="addMsg.VolunteerMajor" label="志愿专业" />
+            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" v-model="addMsg.Price" label="价格" />
+          </div>
+        </q-card-section>
+        <div class="text-caption q-mb-lg q-px-md text-grey-6" v-if="msg.ClassId>0">附加信息</div>
+        <div class="row wrap" style="margin:0 20px;" v-if="msg.ClassId>0">
+          <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" v-model="addMsg.IDCard" label="身份证" />
+          <q-input clearable filled class="col-6 q-pb-lg" v-model="addMsg.Domicile" label="身份证居住地" />
+        </div>
+        <div class="row wrap" style="margin:0 20px;" v-if="msg.ClassId>0">
+          <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" v-model="addMsg.Contact" label="重要联系人" />
+          <q-input clearable filled class="col-6 q-pb-lg" v-model="addMsg.ContactMobile" label="重要联系电话" />
         </div>
-        <div class="row wrap"style="margin:0 20px;">
-          <q-input clearable filled class="col-6 q-pb-lg q-pr-lg"
-            v-model="addMsg.Contact" label="重要联系人" />
-          <q-input clearable filled class="col-6 q-pb-lg"
-            v-model="addMsg.ContactMobile" label="重要联系电话" />
+        <div class="text-caption q-mb-lg q-px-md text-grey-6" v-if="msg.SourceId>0">备注信息</div>
+        <div class="row wrap" style="margin:0 20px;" v-if="msg.SourceId>0">
+          <q-input filled stack-label :dense="false" v-model="addMsg.StudyRemark" type="textarea" class="col-12"
+            label="备注" maxlength="300" />
         </div>
         <q-separator />
         <q-card-actions align="right" class="bg-white">
@@ -93,7 +113,7 @@
     getGuestBasicsEnumList, //日语基础枚举
     getGuestEducationEnumList, //学历枚举
     getGuestLearningGoalsEnumList, //获取学习目的 枚举
-    getOrderSourceEnumList, //来自
+    getOrderSourceEnumList, //来源枚举
     setOrderGuestInfo, //保存
     delOrderGuestInfo, //删除
   } from '../../api/sale/sale'
@@ -104,21 +124,19 @@
         columns: [{
             name: 'GuestName',
             label: '名称',
+            required: true,
             field: 'GuestName',
             align: 'left'
           },
           {
             name: 'Profession',
             field: 'Profession',
-            required: true,
             label: '职业',
             align: 'left',
-
           },
           {
             name: 'Sex',
             label: '性别',
-
             align: 'left'
           },
           {
@@ -163,10 +181,33 @@
             field: 'ContactMobile',
             align: 'left'
           },
+          {
+            name: 'GraduatedSchool',
+            label: '毕业院校',
+            field: 'GraduatedSchool',
+            align: 'left'
+          },
+          {
+            name: 'GraduatedMajor',
+            label: '毕业专业',
+            field: 'GraduatedMajor',
+            align: 'left'
+          },
+          {
+            name: 'VolunteerMajor',
+            label: '志愿专业',
+            field: 'VolunteerMajor',
+            align: 'left'
+          },
+          {
+            name: 'Price',
+            label: '价格',
+            field: 'Price',
+            align: 'left'
+          },
           {
             name: 'optioned',
             label: '操作',
-
           }
         ],
         data: [],
@@ -175,8 +216,9 @@
           pageIndex: 1,
           pageSize: 12,
           rowsPerPage: 12,
-          OrderId: 0,
-          ClassId: 0,
+          OrderId: 0, //订单编号
+          ClassId: 0, //班级编号
+          SourceId: 0, //留学就业编号
           GuestName: '',
           GuestState: 0,
         },
@@ -197,59 +239,89 @@
           LearningGoals: "", //	学习目的
           Contact: '', //紧急联系人
           ContactMobile: '', //紧急联系电话
-          IDCard:'', //身份证
-          Domicile:'', //身份证居住地
-          ContactAddress:'' //联系地址
-        },
-        GBList: [],
-        GEList: [],
-        GLList: [],
-        OFList: [],
-        isShowBtn: true //默认显示新增名单
+          IDCard: '', //身份证
+          Domicile: '', //身份证居住地
+          ContactAddress: '', //联系地址
+          SourceId: 0, //留学就业编号
+          GraduatedSchool: "", //毕业院校
+          GraduatedMajor: "", //毕业专业
+          VolunteerMajor: "", //志愿专业
+          Price: 0, //价格
+          StudyRemark: "", //留学就业备注
+        },
+        GBList: [], //日语基础列表
+        GEList: [], //学历列表
+        GLList: [], //学习目的列表
+        OFList: [], //客人来源列表
+        isShowBtn: true, //默认显示新增名单
+        //表格可见列
+        visibleColumns: [
+          
+        ], //可见列
       }
     },
-    mounted() {
-      if (this.$route.query) {
+    created() {
+      if (this.$route.query && this.$route.query.OrderId) {
         this.msg.OrderId = this.$route.query.OrderId;
         this.addMsg.OrderId = this.$route.query.OrderId;
-        this.msg.ClassId = this.$route.query.ClassId
-        if (this.$route.query.isShow == 1) {
+      }
+      if (this.$route.query && this.$route.query.ClassId) {
+        this.msg.ClassId = this.$route.query.ClassId;
+      }
+      if (this.$route.query && this.$route.query.SourceId) {
+        this.msg.SourceId = this.$route.query.SourceId;
+        this.addMsg.SourceId = this.$route.query.SourceId;
+      }
+      if (this.$route.query && this.$route.query.isShow == 1) {
         this.isShowBtn = true;
       } else {
-          this.isShowBtn = false
+        this.isShowBtn = false;
+      }
+      if(this.msg.ClassId>0)
+      {
+        this.visibleColumns=['GuestName','Profession','Sex','Age','Mobile','Basics','GuestSourceName','LearningGoalsName','Contact','ContactMobile'];
       }
+      if(this.msg.SourceId>0)
+      {
+this.visibleColumns=['GuestName', 'Sex','Age','Mobile','Basics', 'GraduatedSchool','GraduatedMajor','VolunteerMajor','Price'];
       }
-      this.getRolelist();
-      this.getGuestBasics() //日语基础枚举
-      this.getGuestEducation() //学历枚举
-      this.getGuestLearning() //获取学习目的 枚举
-      this.getOrderForm()
+      this.visibleColumns.push('optioned');
+      this.getGuestBasics()
+      this.getGuestEducation()
+      this.getGuestLearning()
+      this.getGuestSource()
+    },
+    mounted() {
+      this.getGuestPage();
     },
     methods: {
+      //日语基础枚举
       getGuestBasics() {
         getGuestBasicsEnumList({}).then(res => {
           if (res.Code == 1) {
             this.GBList = res.Data
           }
-        }).catch(() => {})
+        });
       },
+      //学历枚举
       getGuestEducation() {
         getGuestEducationEnumList({}).then(res => {
           if (res.Code == 1) {
             this.GEList = res.Data;
-
           }
-        }).catch(() => {})
+        });
       },
+      //获取学习目的枚举
       getGuestLearning() {
         getGuestLearningGoalsEnumList({}).then(res => {
           if (res.Code == 1) {
             this.GLList = res.Data;
             this.addMsg.LearningGoals = this.GLList[0].Id
           }
-        }).catch(() => {})
+        });
       },
-      getOrderForm() {
+      //获取客人来源枚举
+      getGuestSource() {
         getOrderSourceEnumList({}).then(res => {
           if (res.Code == 1) {
             this.OFList = res.Data
@@ -260,14 +332,15 @@
       //重新查询
       resetSearch() {
         this.msg.pageIndex = 1;
-        this.getRolelist();
+        this.getGuestPage();
       },
       //翻页
       changePage(val) {
         this.msg.pageIndex = val;
-        this.getRolelist()
+        this.getGuestPage()
       },
-      getRolelist() {
+      //获取学员名单
+      getGuestPage() {
         this.loading = true;
         getOrderGuestPageList(this.msg).then(res => {
           this.loading = false
@@ -277,13 +350,24 @@
           this.loading = false
         })
       },
+      //返回
       goreturn() {
         this.$router.go(-1)
       },
+      //关闭弹窗
       closeSaveForm() {
         this.persistent = false
       },
+      //新增修改学员信息
       save_t() {
+        if (this.addMsg.GuestName == '') {
+          this.$q.notify({
+            type: 'negative',
+            position: "top",
+            message: `请输入客人姓名`
+          })
+          return;
+        }
         if (this.addMsg.Basics == '') {
           this.$q.notify({
             type: 'negative',
@@ -292,6 +376,7 @@
           })
           return;
         }
+        if (this.msg.ClassId > 0) {
           if (this.addMsg.Education == '') {
             this.$q.notify({
               type: 'negative',
@@ -300,6 +385,7 @@
             })
             return;
           }
+        }
         this.saveLoading = true
         setOrderGuestInfo(this.addMsg).then(res => {
           if (res.Code == 1) {
@@ -319,7 +405,8 @@
           this.saveLoading = false
         })
       },
-      initialize() { //初始化数据
+      //初始化数据
+      initialize() {
         this.addMsg = {
           Id: 0,
           OrderId: this.$route.query.OrderId,
@@ -334,15 +421,23 @@
           LearningGoals: this.GLList[0].Id, //	学习目的
           Contact: '', //紧急联系人
           ContactMobile: '', //紧急联系电话
-          IDCard:'', //身份证
-          Domicile:'', //身份证居住地
-          ContactAddress:'' //联系地址
+          IDCard: '', //身份证
+          Domicile: '', //身份证居住地
+          ContactAddress: '', //联系地址
+          SourceId: this.$route.query.SourceId,
+          GraduatedSchool: "", //毕业院校
+          GraduatedMajor: "", //毕业专业
+          VolunteerMajor: "", //志愿专业
+          Price: 0, //价格
+          StudyRemark: "", //留学就业备注
         }
       },
+      //新增学员弹窗
       addxue() {
         this.persistent = true;
-        this.initialize()
+        this.initialize();
       },
+      //修改学员信息
       EditRole(item) {
         this.addMsg.Id = item.Id
         this.addMsg.GuestName = item.GuestName
@@ -359,8 +454,16 @@
         this.addMsg.IDCard = item.IDCard;
         this.addMsg.Domicile = item.Domicile;
         this.addMsg.ContactAddress = item.ContactAddress;
-        this.persistent = true
+
+        this.addMsg.SourceId = this.$route.query.SourceId;
+        this.addMsg.GraduatedSchool = item.GraduatedSchool;
+        this.addMsg.GraduatedMajor = item.GraduatedMajor;
+        this.addMsg.VolunteerMajor = item.VolunteerMajor;
+        this.addMsg.Price = item.Price;
+        this.addMsg.StudyRemark = item.StudyRemark;
+        this.persistent = true;
       },
+      //删除学员
       deleteUser(item) {
         let that = this
         this.$q.dialog({
@@ -382,18 +485,11 @@
                 message: '操作成功',
                 position: 'top'
               })
-              that.getRolelist()
+              that.getGuestPage();
             }
           })
-        }).onCancel(() => {
-
-        });
-
+        }).onCancel(() => {});
       }
-
-
-
-
     }
   }