Browse Source

完善导出接口

bding 1 year ago
parent
commit
c9717a0573

+ 6 - 1
src/views/contract_manage/components/allocationLable.vue

@@ -20,9 +20,14 @@
           <span>{{ `${row.StartDate} - ${row.EndDate}` }}</span>
         </template>
       </el-table-column>
+      <el-table-column align="center" prop="PermissionName" label="签约套餐" width="200">
+        <template slot-scope="{ row }">
+          <el-tag style="margin: 0 10px 5px 0" v-for="item in row.PermissionName.split(',')" :key="item" size="mini">{{ item }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="IsAllocation" label="状态" width="90">
         <template slot-scope="{ row }">
-          <span>{{ row.IsAllocation == 0 ? "未派点" : row.IsAllocation == 1 ? "已派点" : "" }}</span>
+          <span :style="{ color: row.IsAllocation == 0 ? '#FF8A00' : row.IsAllocation == 1 ? '#67C23A' : '' }">{{ row.IsAllocation == 0 ? "未派点" : row.IsAllocation == 1 ? "已派点" : "" }}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="ContractCode" label="操作" v-if="!typeLable">

+ 2 - 1
src/views/contract_manage/components/relatedContract.vue

@@ -59,8 +59,9 @@ export default {
 
     // 获取数据
     async getList() {
+      console.log(this.listDlg);
       const res = await contractInterface.getAllocationContract({
-        ResearcherRealName: this.listDlg.ResearcherRealName,
+        ResearcherRealName: this.listDlg.RealName,
         PageSize: this.PageSize,
         CurrentIndex: this.page_no,
       });

+ 1 - 1
src/views/contract_manage/raiAllocationPage.vue

@@ -153,7 +153,7 @@ export default {
   },
   computed: {
     exportExcel() {
-      let baseUrl = process.env.API_ROOT + "/statistic_report/will_expire_list";
+      let baseUrl = process.env.API_ROOT + "/cygx/allocation/company_contract_list";
       let token = localStorage.getItem("auth") || "";
       let paramStr = "";
       let salesArr = [];

+ 1 - 1
src/views/contract_manage/researcherStatistics.vue

@@ -96,7 +96,7 @@ export default {
   },
   computed: {
     exportExcel() {
-      let baseUrl = process.env.API_ROOT + "/statistic_report/will_expire_list";
+      let baseUrl = process.env.API_ROOT + "/cygx/allocation/statistics";
       let token = localStorage.getItem("auth") || "";
       let paramStr = "";
       let obj = {