zhengjinyi 2 rokov pred
rodič
commit
8241fe143c

+ 15 - 6
src/views/member/coupon/components/good-dialog.vue

@@ -13,8 +13,7 @@
           v-model="listQuery.productId"
           placeholder="商品ID"
           clearable
-          @keyup.enter.native="getList"
-          @clear="getList"
+          @input="e => (listQuery.productId= checkedInput(e,1))"
         />
       </div>
       <div class="filter-control">
@@ -23,8 +22,7 @@
           v-model="listQuery.name"
           placeholder="商品名称"
           clearable
-          @keyup.enter.native="getList"
-          @clear="getList"
+          @input="e => (listQuery.name= checkedInput(e,2))"
         />
       </div>
       <div class="filter-control">
@@ -34,8 +32,7 @@
           placeholder="供应商名称"
           clearable
           style="width:160px;"
-          @keyup.enter.native="getList"
-          @clear="getList"
+          @input="e => (listQuery.shopName= checkedInput(e,2))"
         />
       </div>
       <div class="filter-control">
@@ -142,6 +139,18 @@ export default {
     handleCanle() {
       // 取消弹窗
       this.$emit('cancel')
+    },
+    checkedInput(event, type) {
+      let pattern = ''
+      switch (type) {
+        case 1:
+          pattern = /[^\d]/g
+          break
+        case 2:
+          pattern = /[^u4E00-u9FA5|d|a-zA-Z|rns,.?!,。?!…—&$=()-+/*{}[]]|s/g
+          break
+      }
+      return event.replace(pattern, '')
     }
   }
 }

+ 14 - 0
src/views/member/coupon/components/shop-dialog.vue

@@ -7,6 +7,7 @@
           v-model="listQuery.shopId"
           placeholder="供应商Id"
           clearable
+          @input="e => (listQuery.shopId= checkedInput(e,1))"
         />
       </div>
       <div class="filter-control">
@@ -15,6 +16,7 @@
           v-model="listQuery.name"
           placeholder="供应商名称"
           clearable
+          @input="e => (listQuery.name= checkedInput(e,2))"
         />
       </div>
       <div class="filter-control">
@@ -112,6 +114,18 @@ export default {
     handleCanle() {
       // 取消弹窗
       this.$emit('cancel')
+    },
+    checkedInput(event, type) {
+      let pattern = ''
+      switch (type) {
+        case 1:
+          pattern = /[^\d]/g
+          break
+        case 2:
+          pattern = /[^u4E00-u9FA5|d|a-zA-Z|rns,.?!,。?!…—&$=()-+/*{}[]]|s/g
+          break
+      }
+      return event.replace(pattern, '')
     }
   }
 }

+ 11 - 4
src/views/member/coupon/edit.vue

@@ -55,7 +55,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center">
-                  <el-button type="text" @click="deleteShop(index)">删除</el-button>
+                  <el-button type="text" @click="deleteShop(formItem,index)">删除</el-button>
                 </el-table-column>
               </el-table>
             </template>
@@ -263,9 +263,16 @@ export default {
       this.addIndex = index
       this.dialogGoodVisible = true
     },
-    // 清除供应商
-    deleteShop(index) {
-      this.form.formList[index].shopData = []
+
+    deleteShop(formItem, index) {
+      // 清除供应商
+      formItem.shopId = ''
+      formItem.shopData = []
+      this.$nextTick(() => {
+        console.log('index', formItem)
+        this.form.formList[index].shopId
+        this.form.formList[index].shopData
+      })
     },
     handleShopConfirm(data) {
       // 确认选择供应商

+ 1 - 6
src/views/member/product/components/pro-dialog.vue

@@ -14,8 +14,6 @@
           placeholder="商品ID"
           clearable
           @input="e => (listQuery.productId= checkedInput(e,1))"
-          @keyup.enter.native="getList"
-          @clear="getList"
         />
       </div>
       <div class="filter-control">
@@ -25,8 +23,6 @@
           placeholder="商品名称"
           clearable
           @input="e => (listQuery.name= checkedInput(e,2))"
-          @keyup.enter.native="getList"
-          @clear="getList"
         />
       </div>
       <div class="filter-control">
@@ -36,8 +32,7 @@
           placeholder="供应商名称"
           clearable
           style="width:160px;"
-          @keyup.enter.native="getList"
-          @clear="getList"
+          @input="e => (listQuery.shopName= checkedInput(e,2))"
         />
       </div>
       <div class="filter-control">