Browse Source

luowei修改bug

luowei 2 years ago
parent
commit
18219fdacc
2 changed files with 57 additions and 57 deletions
  1. 56 56
      src/views/information/configuration/index.vue
  2. 1 1
      src/views/system/bind/index.vue

+ 56 - 56
src/views/information/configuration/index.vue

@@ -11,7 +11,7 @@
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业前提醒:" prop="front">
 
-              <el-input-number size="mini" style="width: 70%;" v-model="day.font" @change="handleChange" :min="1"
+              <el-input-number size="mini" style="width: 70%;" v-model="day.front" @change="handleChange" :min="1"
                 :max="10" label="描述文字"></el-input-number>
               分钟
 
@@ -53,41 +53,17 @@
               每周履职
             </div>
           </el-col>
-
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
+          <el-col>
             <el-form-item label="全天提醒:" prop="allDay">
               <el-input-number size="mini" style="width: 30%;" v-model="week.allDay" @change="handleChange" :min="1"
                 :max="10" label="描述文字"></el-input-number>
               分钟
             </el-form-item>
-          </el-col>
-
+          </el-col> 
         </el-row>
-
       </div>
     </el-form>
-    <!-- <el-form :model="week" :rules="rules" ref="week" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每周履职
-            </div>
-          </el-col>
-      
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒:" prop="allDay">
-
-              <el-input-number size="mini" style="width: 70%;" v-model="week.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              天
-
-
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form> -->
+  
     <el-form :model="month" :rules="rules" ref="month" label-width="130px">
       <div class="form-item">
         <el-row>
@@ -96,13 +72,13 @@
               每月履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒:" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
-              
+          <el-col>
+            <el-form-item label="全天提醒:" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="month.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -114,12 +90,13 @@
               每季履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒:" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+          <el-col>
+            <el-form-item label="全天提醒:" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="season.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -131,12 +108,13 @@
               半年履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒:" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+          <el-col>
+            <el-form-item label="全天提醒:" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="halfYear.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -148,12 +126,13 @@
               每年履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒:" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+          <el-col>
+            <el-form-item label="全天提醒:" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="year.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -176,15 +155,36 @@ export default {
       day: {
         resumptionCycle: 1,
         allDay: null,
+        front: null,
         centre: null,
         after: null,
-        timeUnit: null,
+        timeUnit: 1,
+      },
+      week: {
+        resumptionCycle: 2,
+        allDay: null,
+        timeUnit: 2
+      },
+      month: {
+        resumptionCycle: 3,
+        allDay: null,
+        timeUnit: 2
+      },
+      season: {
+        resumptionCycle: 4,
+        allDay: null,
+        timeUnit: 2
+      },
+      halfYear: {
+        resumptionCycle: 5,
+        allDay: null,
+        timeUnit: 2
+      },
+      year: {
+        resumptionCycle: 6,
+        allDay: null,
+        timeUnit: 2
       },
-      week: {},
-      month: {},
-      season: {},
-      halfYear: {},
-      year: {},
 
       rules: {
         name: [
@@ -290,7 +290,7 @@ export default {
       if (!flag) return;
       let data = {
 
-        coreResumptionConfiguration: [this.day, this.week, this.month]
+        coreResumptionConfiguration: [this.day, this.week, this.month,this.season,this.halfYear,this.year]
       };
       insertConfiguration(data).then(response => {
         this.$modal.msgSuccess("新增成功");

+ 1 - 1
src/views/system/bind/index.vue

@@ -23,7 +23,7 @@
           </el-form-item>
 
           <el-form-item label="标签编号" prop="code">
-            <el-input v-model="queryParams.code" placeholder="请输入标签编号" clearable @keyup.enter.native="handleQuery" />
+            <el-input maxlength="50" v-model="queryParams.code" placeholder="请输入标签编号" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>