.

.idea/workspace.xml

@@ -3,6 +3,10 @@
   <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$/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/importRecord.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/marketingGuest/batchAddFriend/addFriend/importRecord.vue" 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/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" />
@@ -53,7 +57,8 @@
       <workItem from="1654573024055" duration="23176000" />
       <workItem from="1654653264438" duration="30604000" />
       <workItem from="1654739102819" duration="11048000" />
-      <workItem from="1654756255993" duration="16636000" />
+      <workItem from="1654756255993" duration="16970000" />
+      <workItem from="1654774566674" duration="811000" />
     </task>
     <servers />
   </component>

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

@@ -6,7 +6,12 @@
     <div v-loading="loading">
       <div class="f14 line21">{{dialogMsg}}</div>
       <div v-if="dialogTitle == '分配'">
-        <self-customerservice title='选择员工' width="300px" :reset="reset" :afferent_users='user_id_list' @customerDefine="(val)=>{user_id_list=val;}"></self-customerservice>
+        <self-customerservice title='选择员工'
+                              width="300px"
+                              :reset="reset"
+                              :afferent_users='user_id_list'
+                              @customerDefine="(val)=>{user_id_list=val;}">
+        </self-customerservice>
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -46,7 +51,7 @@ export default {
           })
           return
         }
-        this.$parent.dialogPublic_allot_single()
+        this.$emit('dialogPublic_allot_single')
       }else if(this.type == 'allotMultiple'){
         if(this.user_id_list && this.user_id_list.length==0){
           this.$message({
@@ -55,14 +60,14 @@ export default {
           })
           return
         }
-        this.$parent.dialogPublic_allot_multiple()
+        this.$emit('dialogPublic_allot_single')
       }else if(this.type == 'importconfirm'){
         this.batchAddCustomerImportConfirm(num)
       }else{
         this.dialogVisible = false
       }
     },
-    addCustomer_notice(){
+    addCustomer_notice(){//单个提醒
       this.loading = true
       this.$axios.post(this.URL.BASEURL + this.URL.noticeUser, {
         user_ids:this.user_ids.join()
@@ -76,7 +81,7 @@ export default {
         this.$loading(this.$loadingConfig).close();
         if(res&&res.errno==0){
           this.dialogVisible = false
-          this.$parent.clearuser_ids()
+          // this.$emit('clearuser_ids')
           this.$parent.init(1)
         }
       }).catch((err) => {
@@ -87,7 +92,7 @@ export default {
         })
       });
     },
-    batchAddCustomerImportConfirm (num){
+    batchAddCustomerImportConfirm (num){//导入客户二次确认
       this.loading = true
       this.$axios.post(this.URL.BASEURL + this.URL.batchAddCustomerImportConfirm, {
         confirm:num,

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

@@ -73,7 +73,12 @@
         </el-pagination>
       </div>
 
-      <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg"></dialogPublic>
+      <!--    提醒分配等公共弹框-->
+      <dialogPublic
+        ref="dialogPublic"
+        :dialogTitle="dialogTitle"
+        :dialogMsg="dialogMsg"
+      ></dialogPublic>
 
     </div>
   </div>

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

@@ -77,7 +77,14 @@
         </el-pagination>
       </div>
 
-      <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg"  :type="dialogType" :user_ids="user_ids"></dialogPublic>
+      <dialogPublic
+        ref="dialogPublic"
+        :dialogTitle="dialogTitle"
+        :dialogMsg="dialogMsg"
+        :type="dialogType"
+        :user_ids="user_ids"
+        @clearuser_ids="()=>{user_ids = []}"
+      ></dialogPublic>
 
     </div>
   </div>

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

@@ -117,7 +117,15 @@
     </div>
 
 <!--    提醒分配等公共弹框-->
-    <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg" :type="dialogType" :user_ids="user_ids"></dialogPublic>
+    <dialogPublic
+      ref="dialogPublic"
+      :dialogTitle="dialogTitle"
+      :dialogMsg="dialogMsg"
+      :type="dialogType"
+      :user_ids="user_ids"
+      @dialogPublic_allot_single="dialogPublic_allot_single"
+      @clearuser_ids="()=>{user_ids = []}"
+    ></dialogPublic>
     <!--    设置-->
     <setting ref="settingRef"></setting>
     <!--    导入客户-->
@@ -208,9 +216,6 @@ export default {
       this.$set(this.rowPro, 'tag_list', val)
       this.$set(this.tableData, this.rowPro.self_index, this.rowPro)
     },
-    clearuser_ids(){//dialogPublic在用
-      this.user_ids = []
-    },
     pageOptionSelect (val) {//选择
       this.pageOptionValue = val