jufubao-admin-library 1.1.10 → 1.1.12

package/library/pageComponents/modules/JfbRuleCreate.vue

@@ -44,6 +44,39 @@
             </div> -->
           </el-form-item> 
         </el-form>
+      </template>
+      <template slot="time">
+        <el-form-item label="">
+          <div class="time_pick" v-for="(item,index) in handTimeOptions" :key="index" style="margin-bottom:5px">
+            <el-select
+              v-model="item.start"
+              placeholder="开始时间"
+              clearable
+            >
+              <el-option
+                :key="item.value"
+                v-for="item in timeList"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <span class="dis_in_mar10">至</span>
+            <el-select
+              v-model="item.end"
+              placeholder="结束时间"
+              clearable
+            >
+              <el-option
+                :key="item.value"
+                v-for="item in timeList"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <i v-if="(index + 1) === handTimeOptions.length" class="el-icon-circle-plus ml5" @click="add(item)" ></i>
+            <i v-if="handTimeOptions.length > 1" class="el-icon-remove ml5" @click="remove(index)"></i>
+          </div>
+        </el-form-item> 
       </template>
 			</xd-base-dynamic-field>
 			<div class="adjust-btn" style="margin-left: 140px">
@@ -92,6 +125,81 @@
             { required: true, message: '请选择标签', trigger: 'change' }
           ],
         },
+        valueFormat: 'HH',
+        pickerOptions: { start: '01',end:'00',step:'01' },
+        handTimeOptions:[{start:'',end:''}],
+        timeList:[
+          {
+            lebel:'1',
+            value:'1',
+          },{
+            lebel:'2',
+            value:'2',
+          },{
+            lebel:'3',
+            value:'3',
+          },{
+            lebel:'4',
+            value:'4',
+          },{
+            lebel:'5',
+            value:'5',
+          },{
+            lebel:'6',
+            value:'6',
+          },{
+            lebel:'7',
+            value:'7',
+          },{
+            lebel:'8',
+            value:'8',
+          },{
+            lebel:'9',
+            value:'9',
+          },{
+            lebel:'10',
+            value:'10',
+          },{
+            lebel:'11',
+            value:'11',
+          },{
+            lebel:'12',
+            value:'12',
+          },{
+            lebel:'13',
+            value:'13',
+          },{
+            lebel:'14',
+            value:'14',
+          },{
+            lebel:'15',
+            value:'15',
+          },{
+            lebel:'16',
+            value:'16',
+          },{
+            lebel:'17',
+            value:'17',
+          },{
+            lebel:'18',
+            value:'18',
+          },{
+            lebel:'19',
+            value:'19',
+          },{
+            lebel:'20',
+            value:'20',
+          },{
+            lebel:'21',
+            value:'21',
+          },{
+            lebel:'22',
+            value:'22',
+          },{
+            lebel:'23',
+            value:'23',
+          },
+        ]
 			}
 		},
     computed: {
@@ -138,6 +246,13 @@
           //电影
           if(this.isMovie) {
             formData = this.setMovieForm(res.data)
+            if(res.data.valid_week_hours){
+              if(!JSON.parse(res.data.valid_week_hours).length){
+                this.handTimeOptions = [{start:'',end:''}]
+              }else{
+                this.handTimeOptions = JSON.parse(res.data.valid_week_hours)
+              }
+            }
 					}
           
           //非电影初始化
@@ -299,6 +414,25 @@
           .then(() => {
             const {select_policy_id} = this;
             let postData = this.getSectionParams();
+            if(this.handTimeOptions.length){
+              let noData = [];
+              for(let i=0;i<this.handTimeOptions.length;i++){
+                if((!this.handTimeOptions[i]['start']&&this.handTimeOptions[i]['end'])||(this.handTimeOptions[i]['start']&&!this.handTimeOptions[i]['end'])){
+                  this.$message.error('请选择时间')
+                  return
+                }
+                if(this.handTimeOptions[i]['end']<this.handTimeOptions[i]['start']){
+                  this.$message.error('开始时间不能大于结束时间')
+                  return
+                }
+                if(this.handTimeOptions[i]['start']&&this.handTimeOptions[i]['end']){
+                  postData.valid_week_hours = JSON.stringify(this.handTimeOptions)
+                }
+              }
+              if(this.handTimeOptions.length==1&&!this.handTimeOptions[0]['start']&&!this.handTimeOptions[0]['end']){
+                postData.valid_week_hours = JSON.stringify(noData)
+              }
+            }
             
             let fn = 'createRole';
             let params = {
@@ -353,7 +487,23 @@
 
       handleBack(){
         this.$router.back()
-			}
+			},
+
+      add(item) {
+        console.log(item,this.handTimeOptions,'this.handTimeOptions')
+        if(!item.start||!item.end){
+          this.$message.error('请选择时间')
+          return
+        }
+        if(this.handTimeOptions.length>=10){
+          this.$message.error('最多支持设置10条')
+          return
+        }
+        this.handTimeOptions.push({start:'',end:''});
+      },
+      remove(index) {
+        this.handTimeOptions.splice(index, 1);
+      },
 			
 		}
   }
@@ -420,4 +570,20 @@
   .mr10{
     margin-right: 10px;
   }
+  .el-icon-circle-plus {
+    font-size: 22px;
+    color: #42B983;
+  }
+
+  .el-icon-remove {
+    font-size: 22px;
+    color: #F56C6C;
+  }
+  .dis_in_mar10{
+    display: inline-block;
+    margin: 0 10px;
+  }
+  .ml5{
+    margin-left: 5px;
+  }
 </style>

package/library/pageComponents/modules/lib/JfbRuleCreate.js

@@ -30,7 +30,16 @@ export default {
       if (n && n !== o) {
         this.initForm(this.listValue)
       }
-    }
+    },
+    'listValue.valid_weeks': {
+      handler (n, o) {
+        console.log(n,o,'pppppp')
+        if (n && JSON.stringify(n) !== JSON.stringify(o)) {
+          console.log(n, o, 'pppp')
+          this.initForm(this.listValue)
+        }
+      }
+    },
   },
   data () {
     return {
@@ -692,6 +701,11 @@ export default {
             { "label": "星期日", "value": 0 }
           ]
         },
+        params.valid_weeks && params.valid_weeks.length&&{
+          lebel: '',
+          ele: 'slot',
+          slot:'time'
+        },
         {
           label: '按价格:',
           ele: 'xd-input-range',

package/library/viewModules/viewsFreightSet/viewsFreightSet/freight_set.vue

@@ -108,7 +108,7 @@
                   this.formData = {};
                   this.formData.formula_unit = res.data.change_json.method;
                   this.formData.formula_value = res.data.change_json.value;
-                  this.initFormList(this.formData,false)
+                  this.initFormList({...res.data,...this.formData},false)
                 } else {
                   this.initFormList({},false)
                 }
@@ -180,7 +180,7 @@
             valueKey: 'formula_value',
             value: params.formula_unit===this.formData.formula_unit?this.formData.formula_value:'',
             setting: {
-              unit: params.formula_unit == 'money' ? '元' : '%',
+              unit: params.formula_unit == 'discount' ? '%' : '元',
               tips: params.formula_unit == 'money' ? '可设置正负值' : '可设置正负值',
               pos: 'append'
             },
@@ -195,7 +195,7 @@
             valueKey: ["start_time", "end_time"],
             value:
               params.start_time && params.end_time
-                ? [params.start_time * 1000, params.end_time * 1000]
+                ? [params.start_time.toString().length===10? params.start_time* 1000:params.start_time, params.end_time.toString().length===10? params.end_time* 1000:params.end_time]
                 : [],
             format: "yyyy/MM/dd HH:mm:ss",
             formatValue: "timestamp",
@@ -220,9 +220,17 @@
       handleSearch({action, form}) {
         console.log(action, 'action')
       },
+      isInter(num){
+        return num%1===0
+      },
       /**保存**/
       handleConfirm() {
-        console.log(this.formParams, 'this.formParams')
+        this.$refs.form.submit().then(res => {
+          console.log(this.formParams, 'this.formParams')
+          if(this.formParams.formula_unit==='money'&&!this.isInter(this.formParams.formula_value)){
+            this.$message.error('金额必须是整数')
+            return
+          }
         let data = {
           change_json:{
             method:'',
@@ -263,6 +271,11 @@
 
           })
         }
+        })
+        .catch(err=>{
+          console.log(err,'err')
+        })
+        
       },
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {