liuxiaona 2 years ago
parent
commit
21dbe854c6

+ 6 - 1
.idea/workspace.xml

3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="f876064f-ad38-46e7-bf7d-9df623a9178f" name="Changes" comment="">
4
     <list default="true" id="f876064f-ad38-46e7-bf7d-9df623a9178f" name="Changes" comment="">
5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <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" />
7
+      <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" />
8
+      <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" />
9
+      <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" />
6
     </list>
10
     </list>
7
     <option name="SHOW_DIALOG" value="false" />
11
     <option name="SHOW_DIALOG" value="false" />
8
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
12
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
53
       <workItem from="1654573024055" duration="23176000" />
57
       <workItem from="1654573024055" duration="23176000" />
54
       <workItem from="1654653264438" duration="30604000" />
58
       <workItem from="1654653264438" duration="30604000" />
55
       <workItem from="1654739102819" duration="11048000" />
59
       <workItem from="1654739102819" duration="11048000" />
56
-      <workItem from="1654756255993" duration="16636000" />
60
+      <workItem from="1654756255993" duration="16970000" />
61
+      <workItem from="1654774566674" duration="811000" />
57
     </task>
62
     </task>
58
     <servers />
63
     <servers />
59
   </component>
64
   </component>

+ 11 - 6
project/src/components/marketingGuest/batchAddFriend/addFriend/dialogPublic.vue

6
     <div v-loading="loading">
6
     <div v-loading="loading">
7
       <div class="f14 line21">{{dialogMsg}}</div>
7
       <div class="f14 line21">{{dialogMsg}}</div>
8
       <div v-if="dialogTitle == '分配'">
8
       <div v-if="dialogTitle == '分配'">
9
-        <self-customerservice title='选择员工' width="300px" :reset="reset" :afferent_users='user_id_list' @customerDefine="(val)=>{user_id_list=val;}"></self-customerservice>
9
+        <self-customerservice title='选择员工'
10
+                              width="300px"
11
+                              :reset="reset"
12
+                              :afferent_users='user_id_list'
13
+                              @customerDefine="(val)=>{user_id_list=val;}">
14
+        </self-customerservice>
10
       </div>
15
       </div>
11
     </div>
16
     </div>
12
     <span slot="footer" class="dialog-footer">
17
     <span slot="footer" class="dialog-footer">
46
           })
51
           })
47
           return
52
           return
48
         }
53
         }
49
-        this.$parent.dialogPublic_allot_single()
54
+        this.$emit('dialogPublic_allot_single')
50
       }else if(this.type == 'allotMultiple'){
55
       }else if(this.type == 'allotMultiple'){
51
         if(this.user_id_list && this.user_id_list.length==0){
56
         if(this.user_id_list && this.user_id_list.length==0){
52
           this.$message({
57
           this.$message({
55
           })
60
           })
56
           return
61
           return
57
         }
62
         }
58
-        this.$parent.dialogPublic_allot_multiple()
63
+        this.$emit('dialogPublic_allot_single')
59
       }else if(this.type == 'importconfirm'){
64
       }else if(this.type == 'importconfirm'){
60
         this.batchAddCustomerImportConfirm(num)
65
         this.batchAddCustomerImportConfirm(num)
61
       }else{
66
       }else{
62
         this.dialogVisible = false
67
         this.dialogVisible = false
63
       }
68
       }
64
     },
69
     },
65
-    addCustomer_notice(){
70
+    addCustomer_notice(){//单个提醒
66
       this.loading = true
71
       this.loading = true
67
       this.$axios.post(this.URL.BASEURL + this.URL.noticeUser, {
72
       this.$axios.post(this.URL.BASEURL + this.URL.noticeUser, {
68
         user_ids:this.user_ids.join()
73
         user_ids:this.user_ids.join()
76
         this.$loading(this.$loadingConfig).close();
81
         this.$loading(this.$loadingConfig).close();
77
         if(res&&res.errno==0){
82
         if(res&&res.errno==0){
78
           this.dialogVisible = false
83
           this.dialogVisible = false
79
-          this.$parent.clearuser_ids()
84
+          // this.$emit('clearuser_ids')
80
           this.$parent.init(1)
85
           this.$parent.init(1)
81
         }
86
         }
82
       }).catch((err) => {
87
       }).catch((err) => {
87
         })
92
         })
88
       });
93
       });
89
     },
94
     },
90
-    batchAddCustomerImportConfirm (num){
95
+    batchAddCustomerImportConfirm (num){//导入客户二次确认
91
       this.loading = true
96
       this.loading = true
92
       this.$axios.post(this.URL.BASEURL + this.URL.batchAddCustomerImportConfirm, {
97
       this.$axios.post(this.URL.BASEURL + this.URL.batchAddCustomerImportConfirm, {
93
         confirm:num,
98
         confirm:num,

+ 6 - 1
project/src/components/marketingGuest/batchAddFriend/addFriend/importRecord.vue

73
         </el-pagination>
73
         </el-pagination>
74
       </div>
74
       </div>
75
 
75
 
76
-      <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg"></dialogPublic>
76
+      <!--    提醒分配等公共弹框-->
77
+      <dialogPublic
78
+        ref="dialogPublic"
79
+        :dialogTitle="dialogTitle"
80
+        :dialogMsg="dialogMsg"
81
+      ></dialogPublic>
77
 
82
 
78
     </div>
83
     </div>
79
   </div>
84
   </div>

+ 8 - 1
project/src/components/marketingGuest/batchAddFriend/addFriend/importRecordDetial.vue

77
         </el-pagination>
77
         </el-pagination>
78
       </div>
78
       </div>
79
 
79
 
80
-      <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg"  :type="dialogType" :user_ids="user_ids"></dialogPublic>
80
+      <dialogPublic
81
+        ref="dialogPublic"
82
+        :dialogTitle="dialogTitle"
83
+        :dialogMsg="dialogMsg"
84
+        :type="dialogType"
85
+        :user_ids="user_ids"
86
+        @clearuser_ids="()=>{user_ids = []}"
87
+      ></dialogPublic>
81
 
88
 
82
     </div>
89
     </div>
83
   </div>
90
   </div>

+ 9 - 4
project/src/components/marketingGuest/batchAddFriend/addFriend/index.vue

117
     </div>
117
     </div>
118
 
118
 
119
 <!--    提醒分配等公共弹框-->
119
 <!--    提醒分配等公共弹框-->
120
-    <dialogPublic ref="dialogPublic" :dialogTitle="dialogTitle" :dialogMsg="dialogMsg" :type="dialogType" :user_ids="user_ids"></dialogPublic>
120
+    <dialogPublic
121
+      ref="dialogPublic"
122
+      :dialogTitle="dialogTitle"
123
+      :dialogMsg="dialogMsg"
124
+      :type="dialogType"
125
+      :user_ids="user_ids"
126
+      @dialogPublic_allot_single="dialogPublic_allot_single"
127
+      @clearuser_ids="()=>{user_ids = []}"
128
+    ></dialogPublic>
121
     <!--    设置-->
129
     <!--    设置-->
122
     <setting ref="settingRef"></setting>
130
     <setting ref="settingRef"></setting>
123
     <!--    导入客户-->
131
     <!--    导入客户-->
208
       this.$set(this.rowPro, 'tag_list', val)
216
       this.$set(this.rowPro, 'tag_list', val)
209
       this.$set(this.tableData, this.rowPro.self_index, this.rowPro)
217
       this.$set(this.tableData, this.rowPro.self_index, this.rowPro)
210
     },
218
     },
211
-    clearuser_ids(){//dialogPublic在用
212
-      this.user_ids = []
213
-    },
214
     pageOptionSelect (val) {//选择
219
     pageOptionSelect (val) {//选择
215
       this.pageOptionValue = val
220
       this.pageOptionValue = val
216
 
221