update: update

src/components/allCustomers/allCustomersList.vue

@@ -160,30 +160,22 @@
     </div>
 
     <!-- 表格字段弹窗 -->
-    <table-colum-dailog :dialogVisible.sync="dialogFieldVisible" :pageName="pageName"
-      :checkedFields="checkedFields" :memberFields="memberFields" @submit="submitMemberFields">
-    </table-colum-dailog>
+    <table-colum-dailog :dialogVisible.sync="dialogFieldVisible" :checkedFields="checkedFields"
+      :memberFields="memberFields" @submit="submitMemberFields" />
     <!-- 批量调整积分弹窗 -->
-    <integral-dailog :dialogVisible.sync="dialogIntegralVisible" :pageName="pageName"
-      :integralFlag="integralFlag" :multipleList="multipleList" :selectAll="selectAll"
-      :pageSize="pageParam.pageSize" :memberSearchStr="pageParam.memberSearchStr"
-      :phoneNameCard="pageParam.phoneNameCard" @refresh="batchRefresh"></integral-dailog>
+    <integral-dailog :dialogVisible.sync="dialogIntegralVisible" @refresh="batchRefresh"
+      :integralFlag="integralFlag" :ajaxObj="{...pageParam,pageName}"
+      :selectObj="{selectAll,multipleList,totalCount}" />
     <!-- 批量修改等级弹窗 -->
-    <grade-dailog :dialogVisible.sync="dialogGradeVisible" :pageName="pageName"
-      :multipleList="multipleList" :gradeList="showEditClique?cliqueMemberGrade:memberGrade"
-      :selectAll="selectAll" :pageSize="pageParam.pageSize"
-      :memberSearchStr="pageParam.memberSearchStr" :phoneNameCard="pageParam.phoneNameCard"
-      @refresh="batchRefresh"></grade-dailog>
+    <grade-dailog :dialogVisible.sync="dialogGradeVisible" @refresh="batchRefresh"
+      :gradeList="showEditClique?cliqueMemberGrade:memberGrade" :ajaxObj="{...pageParam,pageName}"
+      :selectObj="{selectAll,multipleList,totalCount}" />
     <!-- 批量修改服务门店弹窗 -->
-    <mainstore-dailog :dialogVisible.sync="dialogMainstoreVisible" :pageName="pageName"
-      :multipleList="multipleList" :selectAll="selectAll" :pageSize="pageParam.pageSize"
-      :memberSearchStr="pageParam.memberSearchStr" :phoneNameCard="pageParam.phoneNameCard"
-      @refresh="batchRefresh"></mainstore-dailog>
+    <mainstore-dailog :dialogVisible.sync="dialogMainstoreVisible" @refresh="batchRefresh"
+      :selectObj="{selectAll,multipleList,totalCount}" :ajaxObj="{...pageParam,pageName}" />
     <!-- 批量修改协管门店弹窗 -->
-    <substore-dailog :dialogVisible.sync="dialogSubStoreVisible" :pageName="pageName"
-      :multipleList="multipleList" :selectAll="selectAll" :pageSize="pageParam.pageSize"
-      :memberSearchStr="pageParam.memberSearchStr" :phoneNameCard="pageParam.phoneNameCard"
-      @refresh="batchRefresh"></substore-dailog>
+    <substore-dailog :dialogVisible.sync="dialogSubStoreVisible" @refresh="batchRefresh"
+      :selectObj="{selectAll,multipleList,totalCount}" :ajaxObj="{...pageParam,pageName}" />
   </div>
 </template>
 <script>

src/components/allCustomers/components/batchgradeDialog.vue

@@ -2,7 +2,8 @@
   <div>
     <el-dialog title="批量修改等级" custom-class="customer-dailog" :visible.sync="dialogVisible"
       :close-on-click-modal="false" @close="cancel" width="600px">
-      <div class="checkedCustomers">当前选中<span class="num"> {{ multipleList.length }} </span>位客户
+      <div class="checkedCustomers">当前选中<span class="num">
+          {{ selectObj.selectAll?selectObj.totalCount:selectObj.multipleList.length }} </span>位客户
       </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="133px">
         <el-form-item v-if="showEditClique" label="等级类型：" prop="gradeType">
@@ -28,7 +29,7 @@
   </div>
 </template>
 <script>
-import { doFetch, doFetchqs } from "../../axios/api";
+import { doFetch } from "../../axios/api";
 import url from "../../axios/url";
 import { mapState } from "vuex";
 import { checkFalse, checkStatus, checkSuccess } from "../../../../static/js/checkStatus";
@@ -39,33 +40,29 @@ export default {
       type: Boolean,
       default: false
     },
-    multipleList: {
+    gradeList: {
       type: Array,
       default: () => {
         return [];
       }
     },
-    gradeList: {
-      type: Array,
+    ajaxObj: {
+      type: Object,
       default: () => {
-        return [];
+        return {
+          pageName: ''
+        };
       }
     },
-    pageSize: {
-      type: Number,
-      default: ''
-    },
-    memberSearchStr: {
-      type: Number,
-      default: ''
-    },
-    phoneNameCard: {
-      type: String,
-      default: ''
-    },
-    pageName: {
-      type: String,
-      default: ''
+    selectObj: {
+      type: Object,
+      default: () => {
+        return {
+          totalCount: 0,
+          selectAll: false,
+          multipleList: []
+        };
+      }
     },
   },
   data() {
@@ -95,17 +92,19 @@ export default {
     submit() {
       this.$refs[ 'form' ].validate(valid => {
         if (valid) {
+          const { selectAll, multipleList } = this.selectObj;
+          const { memberSearchStr, pageSize, phoneNameCard, pageName } = this.ajaxObj;
           this.btnLoading = true;
           let memberIdsArr = [];
-          this.multipleList.forEach(item => {
+          multipleList.forEach(item => {
             memberIdsArr.push(item.memberId);
           });
           doFetch(url.updateGrade, Object.assign({}, this.form, {
-            memberIds: this.selectAll == true ? "-1" : memberIdsArr.join(","),
-            isCurrent: this.selectAll == true ? 2 : this.multipleList.length == this.pageSize ? 1 : 0,
-            memberSearchParamStr: this.selectAll == true ? (this.memberSearchStr ? this.memberSearchStr : "-1") : "",
-            phoneNameCard: this.phoneNameCard,
-            pageName: this.pageName
+            memberIds: selectAll == true ? "-1" : memberIdsArr.join(","),
+            isCurrent: selectAll == true ? 2 : multipleList.length == pageSize ? 1 : 0,
+            memberSearchParamStr: selectAll == true ? (memberSearchStr ? memberSearchStr : "-1") : "",
+            phoneNameCard: phoneNameCard,
+            pageName: pageName
           }))
             .then(res => {
               if (res.data.errorCode === 0) {

src/components/allCustomers/components/integralDialog.vue

@@ -2,7 +2,8 @@
   <div>
     <el-dialog title="批量调整积分" custom-class="customer-dailog" :visible.sync="dialogVisible"
       :close-on-click-modal="false" @close="cancel" width="600px">
-      <div class="checkedCustomers">当前选中<span class="num"> {{ multipleList.length }} </span>位客户
+      <div class="checkedCustomers">当前选中<span class="num">
+          {{ selectObj.selectAll?selectObj.totalCount:selectObj.multipleList.length }} </span>位客户
       </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="133px">
         <el-form-item label="调整积分：" prop="editType">
@@ -48,29 +49,25 @@ export default {
       type: Boolean,
       default: false
     },
-    multipleList: {
-      type: Array,
+    ajaxObj: {
+      type: Object,
       default: () => {
-        return [];
+        return {
+          pageName: ''
+        };
       }
     },
-    integralFlag: {
-      type: String,
-      default: ''
-    },
-    pageSize: {
-      type: Number,
-      default: ''
-    },
-    memberSearchStr: {
-      type: Number,
-      default: ''
-    },
-    phoneNameCard: {
-      type: String,
-      default: ''
+    selectObj: {
+      type: Object,
+      default: () => {
+        return {
+          totalCount: 0,
+          selectAll: false,
+          multipleList: []
+        };
+      }
     },
-    pageName: {
+    integralFlag: {
       type: String,
       default: ''
     },
@@ -127,23 +124,25 @@ export default {
     submit() {
       this.$refs[ 'form' ].validate(valid => {
         if (valid) {
+          const { selectAll, multipleList } = this.selectObj;
+          const { memberSearchStr, pageSize, phoneNameCard, pageName } = this.ajaxObj;
           this.btnLoading = true;
           let memberIdsArr = [];
-          this.multipleList.forEach(item => {
+          multipleList.forEach(item => {
             memberIdsArr.push(item.memberId);
           });
           doFetch(url.updateIntegrals, Object.assign({}, this.form, {
-            memberIds: this.selectAll == true ? "-1" : memberIdsArr.join(","),
-            isCurrent: this.selectAll == true ? 2 : this.multipleList.length == this.pageSize ? 1 : 0,
-            memberSearchParamStr: this.selectAll == true ? (this.memberSearchStr ? this.memberSearchStr : "-1") : "",
-            phoneNameCard: this.phoneNameCard,
-            pageName: this.pageName
+            memberIds: selectAll == true ? "-1" : memberIdsArr.join(","),
+            isCurrent: selectAll == true ? 2 : multipleList.length == pageSize ? 1 : 0,
+            memberSearchParamStr: selectAll == true ? (memberSearchStr ? memberSearchStr : "-1") : "",
+            phoneNameCard: phoneNameCard,
+            pageName: pageName
           }))
             .then(res => {
               if (res.data.errorCode === 0) {
                 setTimeout(() => {
                   this.btnLoading = false;
-                  checkSuccess();
+                  checkSuccess('提交成功！');
                   this.$refs[ 'form' ].resetFields();
                   this.$emit('update:dialogVisible', false);
                   this.$emit('refresh');

src/components/allCustomers/components/mainstoreDialog.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog title="批量修改服务门店" custom-class="customer-dailog" :visible.sync="dialogVisible"
       :close-on-click-modal="false" @close="cancel" width="600px">
-      <div class="checkedCustomers">当前选中<span class="num"> {{ multipleList.length }} </span>位客户
+      <div class="checkedCustomers">当前选中<span class="num"> {{ selectObj.selectAll?selectObj.totalCount:selectObj.multipleList.length }} </span>位客户
       </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="133px">
         <el-form-item label="服务门店：" prop="mainStoreId">

src/components/allCustomers/components/tableColumDialog.vue

@@ -35,10 +35,6 @@ export default {
       type: Boolean,
       default: false
     },
-    pageName: {
-      type: String,
-      default: ''
-    },
   },
   data() {
     return {

src/components/allCustomers/index.js

@@ -20,7 +20,6 @@ export default {
   data() {
     return {
       sceneValue: "member", // 人群筛选器场景值
-      // pageName: "allCustomer", // 列表字段请求参数
       navpath: [
         { name: "首页", path: "" },
         { name: "客户列表", path: "" },

src/main.js

@@ -7,9 +7,9 @@ import store from './store/store'
 import IconSvg from './components/iconComponent'
 import '../elethem/index.css'
 import '../static/css/index.styl'
+import '../static/css/dmreset.css'
 import '../static/font/iconfont.css'
 import '../static/font/iconfont.js'
-import '../static/css/dmreset.css'
 import gicinput from './common/gicinput'
 import gictextarea from './common/gictextarea'
 import 'babel-polyfill';

src/utils/utils.js

@@ -57,7 +57,6 @@ export function formatLongTime(timeStr, type) {
     });
   } else {
     return timeStr.replace(/^(\d{4})(\d{2})(\d{2})$/g, function(match, p, p1, p2){
-      console.log(p, p1, p2);
       return [p, p1, p2].join('-');
     });
   }
@@ -109,7 +108,6 @@ export function debounce(func, wait) {
   let timeout;
 
   return function(...args) {
-    console.log(args);
     let that = this;
     clearTimeout(timeout);
     timeout = setTimeout(_ => {