14.3 ok

src/views/contract_manage/components/allocationLable.vue

@@ -71,7 +71,6 @@ export default {
   methods: {
     // 查看合同
     async lookContractHandler(item) {
-      console.log(item);
       if (item.FormalType == "非标") {
         const loading = this.$loading({
           lock: true,
@@ -113,7 +112,6 @@ export default {
     allocationDetail(item) {
       if (item.IsGray) return;
       this.$emit("allocationDetailList", item);
-      console.log(112233);
     },
   },
 };

src/views/contract_manage/components/relatedContract.vue

@@ -62,6 +62,9 @@ export default {
       console.log(this.listDlg);
       const res = await contractInterface.getAllocationContract({
         ResearcherRealName: this.listDlg.RealName,
+        Keyword: this.listDlg.searchVal,
+        StartDate: this.listDlg.date[0] ? this.listDlg.date[0] : "",
+        EndDate: this.listDlg.date[1] ? this.listDlg.date[1] : "",
         PageSize: this.PageSize,
         CurrentIndex: this.page_no,
       });

src/views/contract_manage/raiAllocationPage.vue

@@ -7,17 +7,7 @@
       <button :class="['button-sty', { act: filterObj.month === item.label }]" v-for="item in monthLabel" @click="toggleMonth(item.label)" :key="item.label">
         {{ item.label }}
       </button>
-      <date-picker
-        v-model="filterObj.date"
-        type="date"
-        range
-        value-type="format"
-        placeholder="自定义时间段"
-        :clearable="false"
-        :editable="false"
-        :disabled-date="disabledBeforeToday"
-        @change="dateChange"
-      />
+      <date-picker v-model="filterObj.date" type="date" range value-type="format" placeholder="自定义时间段" clearable :editable="false" :disabled-date="disabledBeforeToday" @change="dateChange" />
       <el-input placeholder="请输入客户名称" v-model.trim="searchVal" style="width: 400px; margin-left: auto" @input="handleSearch" clearable>
         <i slot="prefix" class="el-input__icon el-icon-search"></i>
       </el-input>
@@ -171,8 +161,8 @@ export default {
         Keyword: this.searchVal,
         AdminId: salesArr.join(","),
         IsAllocation: this.filterObj.status,
-        StartDate: this.filterObj.date[0],
-        EndDate: this.filterObj.date[1],
+        StartDate: this.filterObj.date[0] ? this.filterObj.date[0] : "",
+        EndDate: this.filterObj.date[1] ? this.filterObj.date[1] : "",
       };
       for (let key in obj) {
         paramStr = `${paramStr}&${key}=${obj[key]}`;
@@ -230,8 +220,8 @@ export default {
         Keyword: this.searchVal,
         AdminId: salesArr.join(","),
         IsAllocation: this.filterObj.status,
-        StartDate: this.filterObj.date[0],
-        EndDate: this.filterObj.date[1],
+        StartDate: this.filterObj.date[0] ? this.filterObj.date[0] : "",
+        EndDate: this.filterObj.date[1] ? this.filterObj.date[1] : "",
       });
       if (res.Ret === 200) {
         this.tableList = res.Data.List;
@@ -266,10 +256,10 @@ export default {
       this.allocationDetailForm = item;
     },
     /* 选择日期 */
-		dateChange(e) {
-			this.page_no = 1;
-			this.getTableData()
-		},
+    dateChange(e) {
+      this.page_no = 1;
+      this.getTableData();
+    },
   },
 };
 </script>

src/views/contract_manage/researcherStatistics.vue

@@ -7,17 +7,7 @@
       <button :class="['button-sty', { act: filterObj.month === item.label }]" v-for="item in monthLabel" @click="toggleMonth(item.label)" :key="item.label">
         {{ item.label }}
       </button>
-      <date-picker
-        v-model="filterObj.date"
-        type="date"
-        range
-        value-type="format"
-        placeholder="自定义时间段"
-        :clearable="false"
-        :editable="false"
-        :disabled-date="disabledBeforeToday"
-        @change="dateChange"
-      />
+      <date-picker v-model="filterObj.date" type="date" range value-type="format" placeholder="自定义时间段" clearable :editable="false" :disabled-date="disabledBeforeToday" @change="dateChange" />
       <el-input placeholder="合同编号/客户名称/社会信用码" v-model="searchVal" style="width: 400px; margin-left: auto" @input="handleSearch" clearable>
         <i slot="prefix" class="el-input__icon el-icon-search"></i>
       </el-input>
@@ -85,6 +75,7 @@ export default {
         sale: "",
         area: "",
       },
+      searchVal: "",
       monthLabel: [
         {
           label: "近1个月",
@@ -110,8 +101,8 @@ export default {
       let token = localStorage.getItem("auth") || "";
       let paramStr = "";
       let obj = {
-        StartDate: this.filterObj.date[0],
-        EndDate: this.filterObj.date[1],
+        StartDate: this.filterObj.date[0] ? this.filterObj.date[0] : "",
+        EndDate: this.filterObj.date[1] ? this.filterObj.date[1] : "",
         Keyword: this.searchVal,
         IsExport: true,
       };
@@ -150,8 +141,8 @@ export default {
     async getTableData() {
       const res = await contractInterface.getAllocationStatistic({
         Keyword: this.searchVal,
-        StartDate: this.filterObj.date[0],
-        EndDate: this.filterObj.date[1],
+        StartDate: this.filterObj.date[0] ? this.filterObj.date[0] : "",
+        EndDate: this.filterObj.date[1] ? this.filterObj.date[1] : "",
       });
       if (res.Ret === 200) {
         this.datalist = res.Data.List;
@@ -168,7 +159,11 @@ export default {
     lookDetailsHadelr(item) {
       if (item.RealName == "合计" || item.RealName == "平均") return;
       this.isShowDlg = true;
-      this.listDlg = item;
+      this.listDlg = {
+        ...item,
+        date: this.filterObj.date,
+        searchVal: this.searchVal,
+      };
     },
     handleSearch() {
       this.getTableData();