禅道bug修改

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleOrderList/index.vue

@@ -185,11 +185,7 @@ export default {
           this.loading = false;
           if (response.state.toLowerCase() === "success") {
             this.pageParams.total = response.data.Totals;
-             for(var i=0;i<response.data.Rows.length;i++){
-              if(response.data.Rows[i].F_State!=0){
-                this.dataLists.push(response.data.Rows[i])
-              }
-            }
+            this.dataLists = response.data.Rows;
           }
         });
         resolve();

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerService/index.vue

@@ -261,11 +261,7 @@ export default {
           this.loading = false;
           if (response.state.toLowerCase() === "success") {
             this.pageParams.total = response.data.Totals;
-            for(var i=0;i<response.data.Rows.length;i++){
-              if(response.data.Rows[i].F_State!=0){
-                this.dataLists.push(response.data.Rows[i])
-              }
-            }
+            this.dataLists = response.data.Rows;
           }
         });
         resolve();

CallCenterWeb.UI/src/views/memberManagement/memberList/components/searchFilter.vue

@@ -7,9 +7,9 @@
       value-format="yyyy-MM-dd"
       class="filter-item"
     ></el-date-picker>
-    <el-select v-model="searchDatas.memberType" placeholder="请选择会员标签" class="form_select" clearable>
+    <el-select v-model="searchDatas.labelList" placeholder="请选择会员标签" class="form_select" clearable>
       <el-option
-        v-for="item in memberType"
+        v-for="item in labelList"
         :key="item.F_Id"
         :label="item.F_Name"
         :value="item.F_Name"
@@ -92,7 +92,6 @@ import memberExtension from "./memberExtension";
 import memberLevel from "./memberLevel";
 import importFile from "./importFile";
 import { getLabelLists } from '@/api/memberManagement/memberList'
-import { getMemberType } from "@/api/memberManagement/memberList";
 export default {
   name: "SearchFilter",
   props: {
@@ -103,7 +102,7 @@ export default {
         return {
           customerName: "", //客户姓名
           phoneNumber: "", //手机号码
-          memberType: "", //会员类型
+          labelList: "", //会员标签
           // province: '', //省份
           // city: '', //市
           // county: '', //县区
@@ -135,7 +134,7 @@ export default {
       },
       level: 0, //城市等级
       deptOptions: [], // 咨询/投诉下拉数据
-      memberType: [], // 会员类型下拉数据
+      labelList: [], // 会员类型下拉数据
       pickerOptions // 日期数据
     };
   },
@@ -313,7 +312,7 @@ export default {
         };
         getLabelLists(params).then(response => {
           if (response.state.toLowerCase() === "success") {
-            this.memberType = response.rows.Rows;
+            this.labelList = response.rows.Rows;
           }
         });
       });

CallCenterWeb.UI/src/views/memberManagement/memberList/index.vue

@@ -69,7 +69,7 @@ export default {
         VIPCode: '', //会员卡编号
         customerName: '', //客户姓名
         phoneNumber: '', //手机号码
-        memberType: '', //会员类型
+        labelList: '', //会员标签
         province: '', //省份
         city: '', //市
         county: '', //县区
@@ -115,7 +115,7 @@ export default {
           pagesize: this.pageParams.pagesize, // int 每页几条信息
           name: this.searchDatas.customerName.trim(), //客户姓名
           phone: this.searchDatas.phoneNumber.trim(), //手机号码
-          type: this.searchDatas.memberType, //会员类型
+          list: this.searchDatas.labelList, //会员标签
           province: this.searchDatas.provinceCityText&&this.searchDatas.provinceCityText[0], //省份
           city: this.searchDatas.provinceCityText[1]&&this.searchDatas.provinceCityText[1], //市
           area: this.searchDatas.provinceCityText[2]&&this.searchDatas.provinceCityText[2], //县区
@@ -149,7 +149,7 @@ export default {
 					'&city=' + (this.searchDatas.provinceCityText.length>1?this.searchDatas.provinceCityText[1]:'') +
 					'&area=' + (this.searchDatas.provinceCityText.length>2?this.searchDatas.provinceCityText[2]:'') +
 					'&town=' + (this.searchDatas.provinceCityText.length>3?this.searchDatas.provinceCityText[3]:'') +
-					'&type=' + this.searchDatas.memberType + //会员类型
+					'&list=' + this.searchDatas.labelList + //会员类型
 					'&address=' + this.searchDatas.address + //地址
 					'&recommender=' + this.searchDatas.referrer + //推荐人
 					'&saleperson=' + this.searchDatas.saleperson + //销售负责人