linwenxin 1 éve
szülő
commit
3a3db65f3b

+ 3 - 3
package-lock.json

@@ -4711,9 +4711,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.11.0",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.11.0.tgz",
-      "integrity": "sha512-/WFCEM2W17djRzAWNw7NxAysmFZx3I7aiCIv9HK46oZRgnNEkuJ2PX0LKuIhJj2kHCKsstl+ddNjrI3/t5ZVyg==",
+      "version": "2.12.0",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.12.0.tgz",
+      "integrity": "sha512-2TnvJ7Flm/ZHWhCxISUJDn4ZrZcfkrYFv0wPrDQAKC4hY0azr3K/3EYsfGscZcls3gWGVqsjq++5b2SkU+wNuw==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

+ 1 - 1
package.json

@@ -18,7 +18,7 @@
     "@turf/turf": "^6.5.0",
     "@vue-office/excel": "^1.3.0",
     "@vue/composition-api": "^1.7.1",
-    "@zjlib/element-plugins": "^2.11.0",
+    "@zjlib/element-plugins": "^2.12.0",
     "@zjlib/element-ui2": "^1.0.3",
     "axios": "0.18.1",
     "chatgpt": "^4.1.2",

+ 2 - 29
src/views/mallManagement/activity/coupon_index/index.vue

@@ -85,9 +85,7 @@ export default {
         imgSrc: [],
         userList: [],
         goodsList: [],
-        tagList: []
       },
-      tagList: [],
       // 选择会员弹窗
       showSelectMember: false,
       showSelectGoods: false,
@@ -158,18 +156,6 @@ export default {
       },
       {
         md: 24,
-        isShow: this.formData.receiveCrowd === 1,
-        name: 'el-select',
-        options: this.tagList,
-        attributes: { filterable: true, placeholder: '请选择', disabled: this.formData.flag === 'START' || this.formDialogType == 2, multiple: true },
-        formItemAttributes: {
-          label: '选择标签',
-          prop: 'tagList',
-          rules: [...required]
-        }
-      },
-      {
-        md: 24,
         isShow: this.formData.receiveCrowd === 2,
         name: 'slot-component',
         formItemAttributes: {
@@ -282,7 +268,7 @@ export default {
           return (
             <div>
               <zj-table
-                columns={[                  
+                columns={[
                   {
                     columnAttributes: {
                       label: '名称',
@@ -491,7 +477,6 @@ export default {
                 receiveDate: res.data.obtainStartTime ? [res.data.obtainStartTime, res.data.obtainEndTime] : [],
                 activeDate: res.data.activeStartTime ? [res.data.activeStartTime, res.data.activeEndTime] : [],
                 imgSrc: res.data.imgSrc ? [{ url: res.data.imgSrc }] : [],
-                tagList: res.data.tagList.map(item => item.tagId)
               })
               this.formDialogType = 2
               this.openForm()
@@ -503,7 +488,6 @@ export default {
                 receiveDate: res.data.obtainStartTime ? [res.data.obtainStartTime, res.data.obtainEndTime] : [],
                 activeDate: res.data.activeStartTime ? [res.data.activeStartTime, res.data.activeEndTime] : [],
                 imgSrc: res.data.imgSrc ? [{ url: res.data.imgSrc }] : [],
-                tagList: res.data.tagList.map(item => item.tagId)
               })
               this.formDialogType = 1
               this.openForm()
@@ -533,17 +517,7 @@ export default {
       this.openForm()
     },
     openForm() {
-      getTagList({
-        pageNum: 1,
-        pageSize: -1,
-      }).then(res => {
-        this.tagList = res.data.records.map(item => ({
-          label: `${item.groupName} - ${item.name}`,
-          value: item.tagId,
-          data: item
-        }));
-        this.formDialog = true;
-      })
+      this.formDialog = true;
     },
     formCancel() {
       this.$refs.formRef.$refs.inlineForm.clearValidate()
@@ -560,7 +534,6 @@ export default {
             activeEndTime: (this.formData.activeDate && this.formData.activeDate[1]) ? this.formData.activeDate[1].split(' ')[0] + ' 23:59:59' : '',
             obtainStartTime: this.formData.receiveDate[0].split(' ')[0] + ' 00:00:00',
             obtainEndTime: this.formData.receiveDate[1].split(' ')[0] + ' 23:59:59',
-            tagList: this.formData.tagList.length ? this.tagList.filter(item => !!~this.formData.tagList.indexOf(item.value)).map(item => item.data) : []
           };
           ([addCoupon, editCoupon][this.formDialogType])(pam).then(res => {
             this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })