| 
					
				 | 
			
			
				@@ -14,6 +14,10 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-button size="mini" @click="formConfirm" type="primary">确 定</el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </el-dialog> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <selectMember v-if="showSelectMember" :memberList="memberList" @cancelSelectMember="showSelectMember = false" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      @selectMemberPass="selectMemberPass" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <selectGoods v-if="showSelectGoods" :goodsList="goodsList" @cancelSelectGoods="showSelectGoods = false" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      @selectGoodsPass="selectGoodsPass" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   </template-page> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -23,8 +27,10 @@ import import_mixin from '@/components/template/import_mixin.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { couponListPageV2, couponListPageV2Export, addCoupon, changeCouponFlag, editCoupon, getCouponDetail, getClassifyList, getGoodsList, getTagList, getMemberList, reissueCoupon } from "@/api/coupon"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { storageListPageV2, storagePageExport, addStorage, deleteStorage, editStorage, getList, getStorageDetail } from "@/api/storage"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import selectMember from "@/components/selectComponent/selectMember.vue" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import selectGoods from "@/components/selectComponent/selectGoods.vue" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  components: { TemplatePage }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  components: { TemplatePage, selectMember, selectGoods }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   mixins: [import_mixin], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   data() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -35,7 +41,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               name: '新建', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               isRole: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              click: this.addData 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              click: () => { this.showSelectGoods = true }//this.addData 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ], 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -60,7 +66,12 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         storageMobile: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         storageAddress: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      tagList:[] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      tagList: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      // 选择会员弹窗 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      showSelectMember: false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      memberList: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      showSelectGoods: false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      goodsList: [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   computed: { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -79,7 +90,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           prop: 'couponName', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           rules: [...required] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      },  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         md: 24, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         isShow: true, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -97,11 +108,11 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         isShow: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         name: 'el-radio', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         options: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          { label: "所有用户", value: 0 },  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { label: "所有用户", value: 0 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           { label: "所有会员", value: 4 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           { label: "所有业务员", value: 3 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          { label: "指定标签", value: 2 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          { label: "指定会员", value: 1 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { label: "指定标签", value: 1 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          { label: "指定会员", value: 2 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         attributes: { filterable: true, placeholder: '请选择' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         formItemAttributes: { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -112,44 +123,56 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         md: 24, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        isShow: true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        isShow: this.formData.receiveCrowd === 1, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         name: 'el-select', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         options: this.tagList, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        attributes: { filterable: true, placeholder: '请选择', disabled:this.formData.flag === 'START' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        attributes: { filterable: true, placeholder: '请选择', disabled: this.formData.flag === 'START' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         formItemAttributes: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           label: '选择标签', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           prop: 'tagValue', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           rules: [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        md: 24, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        isShow: this.formData.receiveCrowd === 2, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        name: 'el-select', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        options: this.tagList, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        attributes: { filterable: true, placeholder: '请选择'}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        formItemAttributes: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          label: '选择会员', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          prop: 'userList', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          rules: [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       ] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -159,7 +182,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 列表导出函数 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     exportList: couponListPageV2Export, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 表格列解析渲染数据更改 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    columnParsing(defaultData) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    columnParsing(item, defaultData) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       return defaultData 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 监听勾选变化 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -200,14 +223,13 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         pageNum: 1, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         pageSize: -1, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.tagList = res.data.records.map(item=>({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          label: item.name, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.tagList = res.data.records.map(item => ({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          label: `${item.groupName} - ${item.name}`, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           value: item.tagId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           data: item 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         })); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.formDialog = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-       
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     formCancel() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$refs.formRef.$refs.inlineForm.clearValidate() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -224,6 +246,14 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    selectMemberPass(val) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.memberList = val 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      console.log(val) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    selectGoodsPass(val) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.goodsList = val 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      console.log(val) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 |