Merge remote-tracking branch 'origin/jd_dev' into jd_dev

src/views/ecw/memberManagement/memberLevelSetting/index.vue

@@ -75,10 +75,10 @@
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center">
         <template slot-scope="scope">
-          <el-button size="mini" type="text"  @click="handleUpdate(scope.row)">{{ $t("修改") }}</el-button>
-          <el-button size="mini" type="text"  @click="handleDelete(scope.row)">{{ $t("删除") }}</el-button>
-          <el-button size="mini" v-if="scope.row.status==0||scope.row.status==2" type="text"  @click="handleEnable(scope.row)">{{ $t("启用") }}</el-button>
-          <el-button size="mini" v-if="scope.row.status==1" type="text"  @click="handleCloseButton(scope.row)">{{ $t("停用") }}</el-button>
+          <el-button size="mini" type="text" v-if="scope.row.status==0" @click="handleUpdate(scope.row)">{{ $t("修改") }}</el-button>
+          <el-button size="mini" type="text" v-if="scope.row.status==0" @click="handleDelete(scope.row)">{{ $t("删除") }}</el-button>
+          <el-button size="mini" v-if="(scope.row.status==0||scope.row.status==2)&&scope.row.status!=3" type="text"  @click="handleEnable(scope.row)">{{ $t("启用") }}</el-button>
+          <el-button size="mini" v-if="scope.row.status==1&&scope.row.status!=3" type="text"  @click="handleCloseButton(scope.row)">{{ $t("停用") }}</el-button>
           <el-button size="mini" type="text"  @click="handleCopyButton(scope.row)">{{ $t("复制") }}</el-button>
         </template>
       </el-table-column>

src/views/ecw/memberManagement/operatingLevel/index.vue

@@ -8,7 +8,7 @@
         <dict-selector clearable :disabled="true" :type="DICT_TYPE.ENABLE_STATUS" v-model="queryParams.status"> </dict-selector>
       </el-form-item>
       <el-form-item :label="$t('名称')" prop="name">
-        <el-input v-model="queryParams.name" style="width: 30%;" clearable onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
+        <el-input v-model="queryParams.name" style="width: 50%;" clearable onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
       </el-form-item>
       <el-form-item :label="$t('等级')" prop="level">
         <dict-selector clearable :disabled="showViewTime" :type="DICT_TYPE.MEMBERSHIP_LEVELS" v-model="queryParams.level"> </dict-selector>
@@ -27,10 +27,14 @@
         </el-col>
       </el-form-item>
       <el-form-item :label="$t('等级有效期')" style="width: 30%;" prop="validityPeriod">
-        <el-input v-model.number="queryParams.validityPeriod" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
+        <el-input v-model="queryParams.validityPeriod" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')">
+          <span slot="append">{{ $t('天') }}</span>
+        </el-input>
       </el-form-item>
       <el-form-item :label="$t('积分累计周期')" style="width: 30%;" prop="accumulationPeriod">
-        <el-input v-model.number="queryParams.accumulationPeriod" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
+        <el-input v-model.number="queryParams.accumulationPeriod" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')">
+          <span slot="append">{{ $t('天') }}</span>
+        </el-input>
       </el-form-item>
       <el-form-item :label="$t('积分开始累计日期')" style="width: 30%;" prop="startDate">
         <el-date-picker type="date" placeholder="选择日期" v-model="queryParams.startDate" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@@ -48,10 +52,12 @@
         <image-upload v-model="queryParams.icon" :fileType="['png', 'jpg', 'jpeg']" :limit="1" />
       </el-form-item>
       <el-form-item :label="$t('等级说明')" style="width: 30%;" prop="description">
-        <el-input type="text" v-model="queryParams.description" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
+        <el-input type="textarea" v-model="queryParams.description" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
+        <span style="color: red;">注：用于客户积分日志显示，请规范填写</span>
       </el-form-item>
       <el-form-item :label="$t('匹配顺序')" style="width: 30%;" prop="sort">
         <el-input v-model.number="queryParams.sort" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
+        <span style="color: red;">注：设置相同等级，匹配的优先级</span>
       </el-form-item>
       <!-- 编辑相关内容 -->
       <div v-if="showViewTime">
@@ -179,7 +185,8 @@ export default {
           {
             required: true,
             message: this.$t("请输入名称"),
-            trigger: "blur"
+            trigger: "blur",
+            max: 50
           }
         ],
         level: [
@@ -192,28 +199,27 @@ export default {
         lowerCount: [
           {
             required: true,
-            message: this.$t("请输入积分最低值"),
+            validator: this.validatePositiveInteger,
             trigger: "blur"
           }
         ],
         upperCount: [
           {
             required: true,
-            message: this.$t("请输入积分最高值"),
+            validator: this.validatePositiveInteger,
             trigger: "blur"
           }
         ],
         validityPeriod: [
           {
-            type: "number",
-            message: this.$t("请输入整数"),
+            validator: this.validatePositiveIntegerorNull,
             trigger: "blur"
           }
         ],
         accumulationPeriod : [
           {
             required: true,
-            message: this.$t("请输入积分累计周期"),
+            validator: this.validatePositiveInteger,
             trigger: "blur"
           },
           {
@@ -245,16 +251,10 @@ export default {
           {
             required: true,
             message: this.$t("请输入等级"),
-            trigger: "blur"
+            trigger: "blur",
+            max: 200
           }
-        ],
-        icon : [
-          {
-            required: true,
-            message: this.$t("请选择图标"),
-            trigger: "blur"
-          }
-        ],
+        ]
       }
     }
   },
@@ -277,7 +277,30 @@ export default {
     }
   },
   methods: {
-
+    validatePositiveInteger(rule, value, callback) {
+      if (!value) {
+        return callback(new Error(this.$t("请输入整数")));
+      } else {
+        const regex = /^[1-9]\d*$/;
+        if (regex.test(value)) {
+          callback();
+        } else {
+          callback(new Error(this.$t("请输入整数")));
+        }
+      }
+    },
+    validatePositiveIntegerorNull(rule, value, callback) {
+      if (value === '') {
+        callback();
+      } else {
+        const regex = /^[1-9]\d*$/;
+        if (regex.test(value)) {
+          callback();
+        } else {
+          callback(new Error(this.$t("请输入整数")));
+        }
+      }
+    },
     handleMemberLevelDetails(){
       memberLevelConfigDetails({ id: this.$route.query.id }).then(response => {
         this.queryParams = response.data
@@ -292,6 +315,17 @@ export default {
     },
     //保存
     handleSaveIntegralRule(){
+      var now = new Date();
+      var nowMidnight = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+      var specificDate = new Date(this.queryParams.startTime);
+      if(specificDate<nowMidnight) {
+        this.$modal.msgWarning('等级规则日期大于等于当前日期')
+        return false
+      }
+      if(this.queryParams.startTime>this.queryParams.endTime) {
+        this.$modal.msgWarning('等级规则日期开始时间不能大于结束时间')
+        return false
+      }
       this.$refs["queryForm"].validate((valid) => {
         if (valid) {
           let params = deepClone(this.queryParams)