save

src/components/SalesModule/productOrderList.vue

@@ -286,6 +286,15 @@
               type="date"></el-date-picker>
           </span>
         </li>
+        <li>
+          <span style="margin: 0 0 0 24px"><em>未维护OP</em>
+            <el-select class="w150" v-model="msg.SelectOP" filterable placeholder="未维护OP">
+              <el-option label="不限" :value="0"></el-option>
+              <el-option v-if="!isVisa" label="主团" :value="1"></el-option>
+              <el-option label="签证" :value="2"></el-option>
+            </el-select>
+          </span>
+        </li>
         <li>
           <div style="margin: 8px 0 0 24px">
           <span><em>只查询有签证的团</em>

src/components/rank/entryForm.vue

@@ -557,7 +557,12 @@ export default {
       );
     },
     getSummaryData() {
+      if(this.msg.pageIndex != 1) {
+        return
+      }
       let param = this.getParams();
+      delete param.pageIndex
+      delete param.pageSize
       this.apipost(
         "sellorder_get_GetSalesVolumeRankDetailStatistics",
         param,
@@ -598,11 +603,13 @@ export default {
     this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
     this.getDepartmentMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
     this.employeeMsg.employeeMsg = this.getLocalStorage().RB_Group_id;
-    const { BranchId = 0, EnterID = 0, RB_Department_Id = 0 } = this.$route.query;
+    const { BranchId = 0, EnterID = 0, RB_Department_Id = 0, tStartDates = [],qStartDates=[] } = this.$route.query;
     console.log("this.$route.query.", this.$route);
     this.queryMsg.RB_Branch_Id = Number(BranchId);
     this.queryMsg.EnterID = Number(EnterID);
     this.queryMsg.RB_Department_Id = Number(RB_Department_Id);
+    this.queryMsg.tStartDates = tStartDates;
+    this.queryMsg.qStartDates = qStartDates;
     this.getCompanyList();
     if (this.queryMsg.RB_Branch_Id >= 0) {
       this.getDepartment(false);

src/components/rank/salesVolumeRank.vue

@@ -127,6 +127,7 @@
       :is-loading="loading"
       sort-always
       @sort-change="sortChange"
+      @on-custom-comp="customCompFunc"
     ></v-table>
   </div>
 </template>
@@ -166,15 +167,7 @@ Vue.component("table-operation", {
   },
   methods: {
     update(rowData, index) {
-      this.$router.push({
-        path: "/salesVolumeRankEntryForm",
-        query: {
-          BranchId: rowData.BranchId,
-          EnterID: rowData.EnterID,
-          RB_Department_Id: rowData.RB_Department_Id,
-            blank: "y",
-        },
-      });
+      this.$emit('on-custom-comp',rowData);
     },
   },
 });
@@ -246,6 +239,18 @@ export default {
     //this.pageSize = this.calcPageSize(40); 此页不需要分页
   },
   methods: {
+    customCompFunc(rowData) {
+      this.$router.push({
+        path: "/salesVolumeRankEntryForm",
+        query: {
+          BranchId: rowData.BranchId,
+          EnterID: rowData.EnterID,
+          RB_Department_Id: rowData.RB_Department_Id,
+            blank: "y",
+        tStartDates: this.msg.tStartDates,
+        qStartDates: this.msg.qStartDates,
+        },
+      });},
     GetAuth() {
       var actionCode = this.$AuthCode.S_CheckAllOrder;
       this.CheckUserAuth(actionCode, res => {