Merge branch 'master' of http://gogs.langye.net:3000/wangyifang/sz-kjsxy-web

src/views/course/components/addCourse.vue

@@ -236,6 +236,19 @@
           </div>
         </div>
       </template>
+      <template v-slot:free_enter_schoolmate v-if="active===0 && form.is_fee===0">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>是否享有校友权益
+          </div>
+          <div class="xy-table-item-content">
+            <el-radio-group style="width:100%" v-model="form.free_enter_schoolmate">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </div>
+        </div>
+      </template>
       <template v-slot:is_chart v-if="active===0">
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
@@ -426,6 +439,7 @@
           show_txl: '',
           show_mobile: '',
           auto_schoolmate: '',
+          free_enter_schoolmate: 0,
           is_chart:'',
           qun_image_id: '',
           image_id: '',
@@ -774,6 +788,7 @@
           this.form.show_txl = res.show_txl === 0 ? 0 : 1
           this.form.show_mobile = res.show_mobile ? res.show_mobile : 0
           this.form.auto_schoolmate = res.auto_schoolmate ? res.auto_schoolmate : 0
+          this.form.free_enter_schoolmate = res.free_enter_schoolmate ? res.free_enter_schoolmate : 0
           this.form.is_chart = res.is_chart ? res.is_chart : 0
           this.showTinymce = true
         })
@@ -871,6 +886,7 @@
             show_txl: '',
             show_mobile: '',
             auto_schoolmate: '',
+            free_enter_schoolmate: 0,
             is_chart:'',
             qun_image_id: '',
             image_id: '', 
@@ -900,6 +916,7 @@
   ::v-deep .is_fee,
   ::v-deep .show_txl,
   ::v-deep .show_mobile,
+  ::v-deep .free_enter_schoolmate
   {
   flex-basis: 25%;
   }

src/views/student/index.vue

@@ -741,6 +741,10 @@
 
           } else {
             _export[item.field] = item.name
+            if (item.field === 'company_name') {
+              _export['company.company_name'] = '企查查名称'
+              _export['company.credit_code'] = '统一社会信用代码'
+            }
           }
         })
 

src/views/student/schoolmateCompany.vue

@@ -48,6 +48,14 @@
               <div>
                 <el-input v-model="select.company_name" placeholder="请输入企业名称" style="width: 200px;"></el-input>
               </div>
+              <div>
+                <el-select filterable v-model="select.has_credit_code" placeholder="是否有统一信用代码" clearable style="width: 180px;">
+                  <el-option label="是" :value="1">
+                  </el-option>
+                  <el-option label="否" :value="0">
+                  </el-option>
+                </el-select>
+              </div>
               <div>
                 <el-input v-model="select.address" placeholder="请输入企业地址" style="width: 200px;"></el-input>
               </div>
@@ -377,6 +385,7 @@
       return {
         select: {
           company_name: '',
+          has_credit_code: '',
           address: '',
           is_yh_invested: '',
           company_tag: '',
@@ -437,6 +446,11 @@
           align: 'left',
           width: 240,
           fixed: 'left'
+        }, {
+          prop: 'credit_code',
+          label: '统一社会信用代码',
+          align: 'center',
+          width: 200
         }, {
           prop: 'company_tag',
           label: '企业资质',
@@ -547,6 +561,7 @@
             start_year: this.select.start_year || '',
             end_year: this.select.end_year || '',
             address: this.select.address || '',
+            has_credit_code: this.select.has_credit_code !== '' && this.select.has_credit_code !== null ? this.select.has_credit_code : '',
             filter: (() => {
               const filter = [{
                 key: 'company_name',
@@ -648,6 +663,7 @@
       resetSelect() {
 
         this.select.company_name = ''
+        this.select.has_credit_code = ''
         this.select.address = ''
         this.select.is_yh_invested = ''
         this.select.company_tag = ''
@@ -727,6 +743,7 @@
           start_year: this.select.start_year || '',
           end_year: this.select.end_year || '',
           address: this.select.address || '',
+          has_credit_code: this.select.has_credit_code !== '' && this.select.has_credit_code !== null ? this.select.has_credit_code : '',
           filter: filter
         })
         this.loading = false