Merge branch 'qaz' of yinet2020/YinetOASystemWeb into master

src/api/duty/duty.js

@@ -1,6 +1,7 @@
 import request from '@/utils/request'
+//值班安排
 
-// 查询【请填写功能名称】列表
+// 查询【本周值班】列表
 export function listDuty(query) {
   return request({
     url: '/system/duty/list',
@@ -17,7 +18,7 @@ export function getDuty(id) {
   })
 }
 
-// 新增【请填写功能名称】
+// 新增【值班】
 export function addDuty(data) {
   return request({
     url: '/system/duty',
@@ -61,11 +62,3 @@ export function listTime(query) {
     params: query
   })
 }
-// 导出【请填写功能名称】
-export function exportDuty(query) {
-  return request({
-    url: '/system/duty/export',
-    method: 'get',
-    params: query
-  })
-}

src/api/officework/index.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+//日程安排
 
 //添加
 export function addRemindEvents(query) {
@@ -40,7 +41,6 @@ export function findList(defId) {
   return request({
     url: '/remindEvents/Getid/'+defId,
     method: 'get',
-    // responseType: 'blob',
     data: defId
   })
 }

src/views/system/duty/duty.vue

@@ -59,14 +59,6 @@
                                   placeholder="选择结束时间">
                   </el-date-picker>
                 </el-form-item>
-<!--                <el-form-item label="值班日期" prop="time">-->
-<!--                  <el-date-picker clearable size="small" style="width: 200px"-->
-<!--                                  v-model="queryParams.time"-->
-<!--                                  type="date"-->
-<!--                                  value-format="yyyy-MM-dd"-->
-<!--                                  placeholder="选择值班日期">-->
-<!--                  </el-date-picker>-->
-<!--                </el-form-item>-->
                 <el-form-item>
                   <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                   <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

src/views/system/officework/schedule/schedule.vue

@@ -21,7 +21,7 @@
       <el-row :gutter="12">
         <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
           <el-col :span="24">
-            <el-form-item label="开始时间" prop="field101">
+            <el-form-item label="开始时间" prop="start">
               <el-date-picker
                 v-model="formData.start"
                 type="datetime"
@@ -32,7 +32,7 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="结束时间" prop="field101">
+            <el-form-item label="结束时间" prop="finish">
               <el-date-picker
                 v-model="formData.finish"
                 type="datetime"
@@ -41,15 +41,14 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
           <el-col :span="24">
-            <el-form-item label="提前提醒" prop="field108">
+            <el-form-item label="提前提醒" prop="hour">
               <el-input v-model="formData.hour" placeholder="小时提醒我" clearable :style="{width: '100%'}">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="日程内容" prop="field109">
+            <el-form-item label="日程内容" prop="incident">
               <el-input v-model="formData.incident" type="textarea" placeholder="记录你将要做的一件事"
                         :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
             </el-form-item>
@@ -57,8 +56,8 @@
         </el-form>
       </el-row>
       <div slot="footer">
-        <el-button @click="schedule = false">取消</el-button>
-        <el-button type="primary"   @click="submit()">确定</el-button>
+        <el-button @click="cancel()">取消</el-button>
+        <el-button type="primary"  @click="submit()">确定</el-button>
       </div>
     </el-dialog>
 <!--    编辑日程-->
@@ -66,7 +65,7 @@
       <el-row :gutter="12">
         <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
           <el-col :span="24">
-            <el-form-item label="开始时间" prop="field101">
+            <el-form-item label="开始时间" prop="start">
               <el-date-picker
                 v-model="formData.start"
                 type="datetime"
@@ -77,7 +76,7 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="结束时间" prop="field101">
+            <el-form-item label="结束时间" prop="finish">
               <el-date-picker
                 v-model="formData.finish"
                 type="datetime"
@@ -88,13 +87,13 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="提前提醒" prop="field108">
+            <el-form-item label="提前提醒" prop="hour">
               <el-input v-model="formData.hour" placeholder="小时提醒我" clearable :style="{width: '100%'}">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="日程内容" prop="field109">
+            <el-form-item label="日程内容" prop="incident">
               <el-input v-model="formData.incident" type="textarea" placeholder="记录你将要做的一件事"
                         :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
             </el-form-item>
@@ -102,7 +101,7 @@
         </el-form>
       </el-row>
       <div slot="footer">
-        <el-button @click="schedule1 = false">取消</el-button>
+        <el-button @click="cancel()">取消</el-button>
         <el-button type="primary"   @click="updatarc()">修改</el-button>
         <el-button type="danger" @click="deletrichen()">删除</el-button>
       </div>
@@ -152,7 +151,6 @@
                 field107: null,
                 hour: undefined,
                 incident: undefined,
-
               },
               rules: {
                 start: [{
@@ -160,21 +158,19 @@
                   message: '请选择开始日期',
                   trigger: 'change'
                 }],
-                field105: [],
                 finish: [{
                   required: true,
                   message: '请选择结束日期',
                   trigger: 'change'
                 }],
-                field107: [],
                 hour: [{
                   required: true,
-                  message: '小时提醒我',
+                  message: '请选择提醒时间',
                   trigger: 'blur'
                 }],
                 incident: [{
                   required: true,
-                  message: '记录你将要做的一件事',
+                  message: '请输入你的记录',
                   trigger: 'blur'
                 }],
               },
@@ -225,7 +221,6 @@
                 minute: '2-digit',
                 hour12: false
               },
-
                 value: new Date(),
               arrList:undefined
             }
@@ -234,6 +229,24 @@
       this.toList();
     },
      methods:{
+       //取消按钮
+       cancel() {
+         this.schedule1 = false;
+         this.reset();
+       },
+       // 表单重置
+       reset() {
+         this.formData = {
+             id:"",
+             start: null,
+             field105: null,
+             finish: null,
+             field107: null,
+             hour: undefined,
+             incident: undefined,
+         },
+         this.resetForm("elForm");
+       },
        //修改日程
        updatarc(){
          var formdata = new FormData
@@ -270,24 +283,11 @@
               start: response.rows[i].start,
               end: response.rows[i].finish,
               defId:response.rows[i].id,
-              // allDay: arg.allDay
             });
           }
-
-          // this.loading = false;
-          // this.toList();
-          // console.log( this.calendarOptions.events)
         })
       },
-          // queding(){
-          //   this.calendarOptions.events.push({ // add new event data
-          //     title: this.formData.hour,
-          //     start: this.formData.start,
-          //     end:this.formData.finish,
-          //     // allDay: arg.allDay
-          //   })
-          //   this.dialogVisible = false;
-          // },
+
           handleDateClick(arg) {
             this.$confirm('是否要添加一个新的日程?', '提示', {
               confirmButtonText: '确定',
@@ -295,12 +295,9 @@
               type: 'warning'
             }).then(() => {
               this.schedule = true;
+              this.formData = {};
               this.formData.start = new Date();
             }).catch(() => {});
-
-            //     if (confirm('您是否要在' + arg.dateStr + '添加一个新的事件?')) {
-            //   this.schedule = true;
-            // }
           },
           handleEventClick(info) {
             // alert('日程安排为：' + info.event.title);
@@ -317,23 +314,23 @@
               this.formData= response.rows[0];
 
             });
-            // this.deletrichen();
-            //alert('Coordinates: ' + info.jsEvent.pageX + ',' + info.jsEvent.pageY);
-            //alert('View: ' + info.view.type);
-
-            // change the border color just for fun
           },
           //添加日程
           submit: function() {
-            addRemindEvents(this.formData).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("添加成功");
-                this.schedule=false;
-                // this.toList();
-                this.calendarOptions.events = [];
-                this.toList();
+            this.$refs["elForm"].validate(valid => {
+              if (valid) {
+                addRemindEvents(this.formData).then(response => {
+                  if (response.code === 200) {
+                    this.msgSuccess("添加成功");
+                    this.schedule=false;
+                    // this.toList();
+                    this.calendarOptions.events = [];
+                    this.toList();
+                  }
+                });
               }
-            });
+            })
+
             this.resetForm();
 
           },
@@ -355,9 +352,6 @@
               this.calendarOptions.events = [];
               this.toList();
             }).catch(function() {});
-
-
-
           },
           resetForm() {
             this.formData=[];