.

.idea/workspace.xml

@@ -3,27 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="f876064f-ad38-46e7-bf7d-9df623a9178f" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importRecordDetial.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importRecordDetial.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/setting.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/setting.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/app.e155fb38.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/chunk-vendors.01b3e040.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/favicon.ico" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/index.html" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/about.0c77b459.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/about.0c77b459.js.map" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/app.94e42e6b.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/app.94e42e6b.js.map" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/chunk-vendors.f252284d.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/chunk-vendors.f252284d.js.map" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/src/views/HomeView.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/HomeView.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/css/app.ca0bb2ce5da7c6112059c43a66539fe9.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/32.ed17950db5aa1c8331df.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/33.d8551f260ee729e34453.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/34.99b920e67caecb79c65f.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/7.eaa21a0a6bf804bea81b.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/app.45403076c99d3dc6e810.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/static/js/manifest.7d3582531b7ed57472bc.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/dialogPublic.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/dialogPublic.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/index.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -74,7 +56,7 @@
       <workItem from="1654573024055" duration="23176000" />
       <workItem from="1654653264438" duration="30604000" />
       <workItem from="1654739102819" duration="11048000" />
-      <workItem from="1654756255993" duration="14418000" />
+      <workItem from="1654756255993" duration="15471000" />
     </task>
     <servers />
   </component>

index.html

@@ -7,4 +7,4 @@
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
         var s = document.getElementsByTagName("script")[0];
         s.parentNode.insertBefore(hm, s);
-      })();</script><link href=./static/css/app.06f1c5b70abb97f295ba1f5285f77c7b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.ba131a074f7ecad8ec91.js></script><script type=text/javascript src=./static/js/app.6f405954ea664523bc98.js></script></body></html>
+      })();</script><link href=./static/css/app.3315ac4302e2e41ff3d3d579655a853b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d6241e2d4a048e9ec36f.js></script><script type=text/javascript src=./static/js/app.6f405954ea664523bc98.js></script></body></html>

project/src/components/marketingGuest/batchAddFriend/addFriend/dialogPublic.vue

@@ -21,7 +21,7 @@ import selfCustomerservice from '@/components/assembly/screen/customerService.vu
 export default {
   name: "dialogPublic",
   components:{selfCustomerservice},
-  props:['dialogTitle','dialogMsg','type','user_ids'],
+  props:['dialogTitle','dialogMsg','type','user_ids','new_file_name'],
   data(){
     return{
       reset:true,
@@ -90,7 +90,8 @@ export default {
     batchAddCustomerImportConfirm (num){
       this.loading = true
       this.$axios.post(this.URL.BASEURL + this.URL.batchAddCustomerImportConfirm, {
-        confirm:num
+        confirm:num,
+        new_file_name:this.new_file_name,
       }).then((res) => {
         var res = res.data
         this.loading = false

project/src/components/marketingGuest/batchAddFriend/addFriend/importCustomer.vue

@@ -51,7 +51,7 @@
           <el-button size="mini" type="primary" @click="save()">导 入</el-button>
         </span>
     </el-dialog>
-    <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg" :type="dialogType"></dialogPublic>
+    <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg" :type="dialogType" :new_file_name="new_file_name"></dialogPublic>
   </div>
 </template>
 

project/src/components/marketingGuest/batchAddFriend/addFriend/index.vue

@@ -385,7 +385,7 @@ export default {
       })
     },
 
-    init (page, type) {
+    init (page, type, source) {
       this.page = page ? page : this.page;
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.batchAddCustomerDetailsList, {
@@ -405,19 +405,32 @@ export default {
           this.total = res.rst.pageInfo.total;
           this.pages = res.rst.pageInfo.pages;
 
-          //重置
-          this.user_ids=[]
-          this.select_id_list=[]
-          this.exclude_id_list=[]
-
-          if(this.pageOptionValue == 1){
-            this.$nextTick(() => {
-              this.tableData.forEach((row) => {
-                this.$refs.multipleTable.toggleRowSelection(row, true);
+          if(source == 'handleCurrentChange'){
+            if(this.pageOptionValue == 1){
+              this.$nextTick(() => {
+                this.tableData.forEach((row) => {
+                  this.$refs.multipleTable.toggleRowSelection(row, true);
+                  this.exclude_id_list.forEach((item)=>{
+                    if(item == row.id){
+                      this.$refs.multipleTable.toggleRowSelection(row, false);
+                    }
+                  })
+                })
+              })
+            }
+          }else{
+            //重置
+            this.user_ids=[]
+            this.select_id_list=[]
+            this.exclude_id_list=[]
+            if(this.pageOptionValue == 1){
+              this.$nextTick(() => {
+                this.tableData.forEach((row) => {
+                  this.$refs.multipleTable.toggleRowSelection(row, true);
+                })
               })
-            })
+            }
           }
-
         } else if (res.errno != 4002) {
           this.$message({
             message: res.err,
@@ -429,7 +442,7 @@ export default {
       });
     },
     handleCurrentChange (val) {
-      this.init(val)
+      this.init(val,'','handleCurrentChange')
     },
   }
 }