修改tag015的生日标签

src/components/tag/tag-config-options.vue

@@ -1299,7 +1299,6 @@ export default {
       let tagValue = JSON.parse(this.templateDataList.tagValue);
       let tagParams = JSON.parse(this.templateDataList.tagParams);
       let value = null;
-      let radio = null;
       let selectVal = null;
       let checkedCount = null;
 
@@ -1372,10 +1371,24 @@ export default {
             break;
 
           case 'tag015':
-            radio = tagParams.template[0].radio;
-            value = tagValue.val[0].data.value.split(',');
-            this.templateData[0].radio = radio;
-            this.templateData[0].monthDayRange = value;
+            for (let i = 0; i < this.templateData.length; i++) {
+              if (this.templateData[i].templateCode === 'tag015') {
+                let templateDate = tagParams.template[0];
+                this.templateData[i].radio = templateDate.radio; // 时段
+                this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
+                this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
+                this.templateData[i].timeChecked = templateDate.timeChecked;
+                if (templateDate.dateRangeValue.length) {
+                  this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
+                } else {
+                  this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
+                }
+                // 如果有最近选项必有 timeInput
+                if (this.templateData[i].timeAfterChecked) {
+                  this.templateData[i].timeInput = tagValue.val[0].data.value;
+                }
+              }
+            }
             break;
 
           case 'tag012':

src/components/tagDetail/mixin/index.js

@@ -440,11 +440,11 @@ export default {
       }
 
       /* 固定/相对 年月日+最近+之后  年月日+最近  年月日时分秒-年月日时分秒 */
-      if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
+      if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
         that.$message.error({ message: '请选择值' });
         return false;
       }
-      if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020')) {
+      if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015')) {
         for (let k of this.templateData) {
           if (!k.timeChecked && !k.timeAfterChecked && k.radio == 2) {
             let tips = k.timeRadio == 1 ? '天' : k.timeRadio == 2 ? '月' : '年';
@@ -467,7 +467,7 @@ export default {
         }
       }
 
-      if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020') && that.templateData.length === 1 && that.templateData[0].radio == 1) {
+      if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015') && that.templateData.length === 1 && that.templateData[0].radio == 1) {
         if (that.currentComputeType == 2) {
           tagValue.val[0].data.compute = 'between';
         } else {
@@ -485,7 +485,7 @@ export default {
         that.postTemplateData.selectedVal.push(that.templateData[0].dateRangeValue[0].split(' ')[0] + '至' + that.templateData[0].dateRangeValue[1].split(' ')[0]);
       }
       
-      if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020') && that.templateData.length === 1 && that.templateData[0].radio == 2) {
+      if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015') && that.templateData.length === 1 && that.templateData[0].radio == 2) {
         // 天
         // timeAfterChecked 最近/之后
         // timeChecked 当天/年/月