chenrui 3 місяців тому
батько
коміт
d62d8df061

BIN
public/templ/产品抵扣金额导入模板.xlsx


+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1741750357861
+  "version": 1741767223146
 }

+ 6 - 2
src/views/promotionManagement/rechargeSettings/editModal.vue

@@ -23,14 +23,18 @@
               id="rechargeEdit-rechargeAmount"
               v-model.trim="form.rechargeAmount"
               style="width: 35%;margin:0 10px;"
+              :min="0.01"
               :max="999999"
               :precision="2"
+              :disabled="itemSn?true:false"
               placeholder="请输入"/>元,送<a-input-number
                 id="rechargeEdit-giveAmount"
                 v-model.trim="form.giveAmount"
                 style="width: 35%;margin:0 10px;"
+                :min="0.01"
                 :max="999999"
                 :precision="2"
+                :disabled="itemSn?true:false"
                 placeholder="请输入"/>元补贴
           </div>
         </a-form-model-item>
@@ -38,9 +42,9 @@
           <a-textarea
             :autosize="{minRows: 5, maxRows: 5}"
             id="rechargeEdit-remarks"
-            :maxLength="100"
+            :maxLength="50"
             v-model="form.remarks"
-            placeholder="请输入备注(最多100个字符)"
+            placeholder="请输入备注(最多50个字符)"
             allowClear />
         </a-form-model-item>
         <div class="tipWord">注意:请设置【补贴产品】</div>

+ 6 - 3
src/views/promotionManagement/subsidizedProducts/list.vue

@@ -145,7 +145,8 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        categorySn: undefined // 商城类目sn
+        categorySn1: undefined, // 商城一级类目
+        categorySn2: undefined // 商城二级类目
       },
       openAddModal: false, // 打开新增弹窗
       openEditModal: false, // 打开编辑弹窗
@@ -287,7 +288,8 @@ export default {
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
-      this.queryParam.categorySn = undefined
+      this.queryParam.categorySn1 = undefined
+      this.queryParam.categorySn2 = undefined
       this.productType = []
       this.category = []
       this.$refs.table.refresh()
@@ -300,7 +302,8 @@ export default {
     },
     // 商城类目
     changeProductsCategory (val) {
-      this.queryParam.categorySn = (val[0] && val[1]) ? val[1] : (val[0] && !val[1]) ? val[0] : undefined
+      this.queryParam.categorySn1 = val[0] ? val[0] : ''
+      this.queryParam.categorySn2 = val[1] ? val[1] : ''
     },
     // 初始化
     pageInit () {

+ 3 - 14
src/views/promotionManagement/subsidizedProducts/subsidyAddModal.vue

@@ -43,11 +43,6 @@
                 <productBrand id="subsidyAdd-productBrandSn" v-model="queryParam.productBrandSn"></productBrand>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="商城类目">
-                <mallCategory id="subsidyAdd-category" @change="changeProductsCategory" v-model="category"></mallCategory>
-              </a-form-model-item>
-            </a-col>
             <a-col flex="auto" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" id="subsidyAdd-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" id="subsidyAdd-reset">重置</a-button>
@@ -61,6 +56,7 @@
             id="subsidyAdd-name"
             v-model.trim="subsidyAmount"
             style="width: 20%;margin:0 10px;"
+            :min="0.01"
             :max="99999999"
             :precision="2"
             :step="1"
@@ -103,12 +99,11 @@ import { STable } from '@/components'
 // 组件
 import productType from '@/views/common/productType.js'
 import productBrand from '@/views/common/productBrand.js'
-import mallCategory from '@/views/common/mallCategory.js'
 // 接口
 import { queryProductPageList } from '@/api/shopProductSubsidy'
 export default {
   name: 'SubsidyAddModal',
-  components: { STable, productType, productBrand, mallCategory },
+  components: { STable, productType, productBrand },
   mixins: [commonMixin],
   props: {
     openModal: {
@@ -132,8 +127,7 @@ export default {
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
-        productTypeSn3: '', //  产品三级分类
-        categorySn: undefined // 商城类目
+        productTypeSn3: '' //  产品三级分类
       },
       subsidyAmount: undefined, // 产品抵扣
       rowSelectionInfo: null, // 已选产品
@@ -187,10 +181,6 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     },
-    // 商城类目
-    changeProductsCategory (val) {
-      this.queryParam.categorySn = (val[0] && val[1]) ? val[1] : (val[0] && !val[1]) ? val[0] : undefined
-    },
     // 批量添加
     handlePlAdd () {
       if (!this.selectTotal) {
@@ -216,7 +206,6 @@ export default {
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
-      this.queryParam.categorySn = undefined
       this.productType = []
       this.category = []
       this.rowSelectionInfo = null