更新

src/mixin/formMixin.js

@@ -704,6 +704,18 @@ export default {
     getCompanyConfig() {
       companyConfig().then(res => {
         this.formSelect.company_type = res.companiesTags
+        this.selectFormList.map(sform => {
+          if (sform.field === 'company_type') {
+            sform.select_item=[]
+            this.formSelect['company_type'].map(kf => {
+              sform.select_item.push({
+                key: kf,
+                value: kf
+              })
+            })
+            console.log("sform.select_item", sform.select_item)
+          }
+        })
       })
     },
     getAllPara() {
@@ -724,7 +736,7 @@ export default {
         // 数据插入到 selectFormList 的select_item中{key:'',value:''}
         this.selectFormList.map(sform => {
           for (var k in this.formSelect) {
-            if (sform.field === k) {
+            if (sform.field === k && k!="company_type") {
               this.formSelect[k].map(kf => {
                 sform.select_item.push({
                   key: kf.value,

src/views/course/apply.vue

@@ -271,7 +271,7 @@
           }, {
             key: 'start_date',
             op: 'range',
-            value: this.select.dateRange
+            value: this.select.dateRange?this.select.dateRange.join(","):''
           }]
         })
         this.list = res.data
@@ -290,7 +290,7 @@
       },
       changeDateRange(e) {
         if (e) {
-          this.select.dateRange = e.join(",")
+          this.select.dateRange = e
         } else {
           this.select.dateRange = ''
         }

src/views/statistics/index.vue

@@ -297,7 +297,7 @@ export default {
         const today = new Date()
         const thisYear = today.getFullYear()
         this.filterForm.startDate = new Date(thisYear, 0, 1) // 今年1月1日
-        this.filterForm.endDate = today
+        this.filterForm.endDate = new Date(thisYear, 11, 31)
       } else if (value === 'lastYear') {
         // 去年：设置为去年第一天到最后一天
         const today = new Date()
@@ -750,9 +750,9 @@ export default {
       // 更新区域明细统计表格
       if (data && data.areas && Array.isArray(data.areas)) {
         this.regionData = data.areas.map(item => ({
-          region: item.value || '',
+          region: item.area || '',
-          totalPeople: item.course_signs_pass || 0,
+          totalPeople: item.total || 0,
-          uniquePeople: item.course_signs_pass_unique || 0
+          uniquePeople: item.total_unique || 0
         }))
         this.regionSummary = this.regionData.reduce((acc, row) => ({
           totalPeople: acc.totalPeople + (Number(row.totalPeople) || 0),

src/views/student/schoolmateCompany.vue

@@ -69,7 +69,7 @@
           </el-table-column>
         </template>
         <template v-slot:project_users>
-          <el-table-column align='center' label="项目经理" width="300" header-align="center">
+          <el-table-column align='center' label="管理平台-项目经理-首次出资时间" width="300" header-align="center">
             <template slot-scope="scope">
               <div v-for="(item,index) in scope.row.project_users">
                 <div style="text-align: left;">