Merge branch 'qaz' of yinet2020/YinetOASystemWeb into master

src/api/officework/index.js

@@ -8,7 +8,14 @@ export function addRemindEvents(query) {
     params: query
   })
 }
-
+//修改
+export function updatarichen(query) {
+  return request({
+    url: '/remindEvents/edit',
+    method: 'post',
+    data: query
+  })
+}
 //查询
 export function selectList(query) {
   return request({
@@ -26,3 +33,15 @@ export function delSchenule(defId) {
     data: defId
   })
 }
+
+//查询
+export function findList(defId) {
+  return request({
+    url: '/remindEvents/Getid/'+defId,
+    method: 'get',
+    // responseType: 'blob',
+    data: defId
+  })
+}
+
+

src/components/ChatLog/ChatLog.vue

@@ -78,7 +78,6 @@
         // let history = deepCopy(this.history)
         const self = this
         getChatlog(self.mine.id).then(function (response) {
-          debugger
           let history =response.data
           history.records.forEach(item => {
             item.mine = item.sender == self.mine.id.toString()

src/views/system/actform/fawen/write1.vue

@@ -83,13 +83,6 @@
         <tr>
           <td colspan="2">
             <el-form-item label="标题：" prop="fwtitle">
-              <el-input v-model="form.fwtitle"  type="text" placeholder=""/>
-            </el-form-item>
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <el-form-item label="部门：" prop="fwdept">
               <el-input v-model="form.fwdept"  type="text" placeholder=""/>
             </el-form-item>
           </td>
@@ -402,6 +395,7 @@
     created() {
       // this.getList();
       this.form.actkey = this.data;
+      // alert(this.data)
     },
     methods: {
 

src/views/system/email/send1.vue

@@ -41,7 +41,7 @@
           this.title = "选择收件人";
         },
         selectOK(zh, xm) {
-          this.receiverAccount = zh;
+          // this.receiverAccount = zh;
           this.receiverName=xm;
           this.open=false;
         }

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

@@ -1,13 +1,15 @@
 <template>
-  <div class="app-container">
-    <FullCalendar defaultView="dayGridMonth" :options="calendarOptions" locale="zh-cn" firstDay="1" weekNumberCalculation="ISO"
+  <div class="app-container" v-if="isReloadData">
+    <FullCalendar v-loading="loading" defaultView="dayGridMonth" :options="calendarOptions" locale="zh-cn" firstDay="1" weekNumberCalculation="ISO"
                   showNonCurrentDates="false"
                   :eventTimeFormat="evnetTime"
                   :header="header"
+                  :lang="lang"
                   :buttonText="buttonText"
                   @dateClick="handleDateClick"
                   @eventClick="handleEventClick"
     />
+<!--    添加日程-->
     <el-dialog  :visible.sync="schedule"  title="添加日程" append-to-body width="40%" @click="close">
       <el-row :gutter="12">
         <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
@@ -52,14 +54,61 @@
         <el-button type="primary"   @click="submit()">确定</el-button>
       </div>
     </el-dialog>
+<!--    编辑日程-->
+    <el-dialog  :visible.sync="schedule1"  title="编辑日程" append-to-body width="40%" >
+      <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-date-picker
+                v-model="formData.start"
+                type="datetime"
+                :style="{width: '100%'}"
+                placeholder="选择日期时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="结束时间" prop="field101">
+              <el-date-picker
+                v-model="formData.finish"
+                type="datetime"
+                :style="{width: '100%'}"
+                placeholder="选择日期时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="提前提醒" prop="field108">
+              <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-input v-model="formData.incident" type="textarea" placeholder="记录你将要做的一件事"
+                        :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div slot="footer">
+        <el-button @click="schedule1 = false">取消</el-button>
+        <el-button type="primary"   @click="updatarc()">修改</el-button>
+        <el-button type="danger" @click="deletrichen()">删除</el-button>
+      </div>
+    </el-dialog>
   </div>
   </template>
 <script>
-  import { addRemindEvents,selectList,delSchenule} from "@/api/officework/index";
+  import { addRemindEvents,selectList,delSchenule,findList,updatarichen} from "@/api/officework/index";
   import FullCalendar from '@fullcalendar/vue'
   import dayGridPlugin from '@fullcalendar/daygrid'
   import interactionPlugin from '@fullcalendar/interaction'
   import '@fullcalendar/core/main.css';
+  import '@fullcalendar/core/locales/zh-cn.js'
   import { formatDate } from '@fullcalendar/vue';
 
   let str = formatDate(new Date(), {
@@ -75,18 +124,20 @@
     name: "schedule",
     components: {
       FullCalendar
-
-
     },
         data(){
             return {
+              isReloadData: true,
+              loading:true,
               dialogVisible:false,
               qqq:'',
               kaishi:'',
               jieshu:'',
               eveid:'',
               schedule: false,
+              schedule1:false,
               formData: {
+                id:"",
                 start: null,
                 field105: null,
                 finish: null,
@@ -155,11 +206,31 @@
     created() {
       this.toList();
     },
-        methods:{
+     methods:{
+       //修改日程
+       updatarc(){
+
+         updatarichen(this.formData).then(response => {
+           if (response.code === 200) {
+             this.msgSuccess("修改成功");
+             this.schedule=false;
+             this.toList();
+           }
+         });
+         this.resetForm();
+
+
+       },
+       reload() {
+         this.isReloadData = false;
+         this.$nextTick(() => {
+           this.isReloadData = true;
+         });
+       },
       toList (){
+        this.loading = true;
         selectList(this.formData).then(response => {
           console.log(response.rows)
-
           for(var i = 0; i < response.rows.length;i++){
             this.calendarOptions.events.push({ // add new event data
               title: response.rows[i].incident,
@@ -169,6 +240,7 @@
               // allDay: arg.allDay
             });
           }
+          this.loading = false;
 
           // this.toList();
           console.log( this.calendarOptions.events)
@@ -184,15 +256,36 @@
           //   this.dialogVisible = false;
           // },
           handleDateClick(arg) {
-            if (confirm('您是否要在' + arg.dateStr + '添加一个新的事件?')) {
+
+            this.$confirm('是否要添加一个新的日程?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
               this.schedule = true;
-            }
+              this.formData.start = new Date();
+            }).catch(() => {});
+
+            //     if (confirm('您是否要在' + arg.dateStr + '添加一个新的事件?')) {
+            //   this.schedule = true;
+            // }
           },
           handleEventClick(info) {
             // alert('日程安排为：' + info.event.title);
             // console.log(info.event)
             this.eveid = info.event._def.extendedProps.defId
-            this.deletrichen();
+
+            this.schedule1 = true;
+            // this.updatarc();
+            let defId = this.eveid;
+            var formdata = new FormData;
+            formdata.append('id', defId)
+            findList(defId).then(response =>{
+              console.log(response.rows[0])
+              this.formData= response.rows[0];
+
+            });
+            // this.deletrichen();
             //alert('Coordinates: ' + info.jsEvent.pageX + ',' + info.jsEvent.pageY);
             //alert('View: ' + info.view.type);
 
@@ -212,21 +305,23 @@
           },
           //删除日程
           deletrichen(){
-        let defId = this.eveid;
+            let defId = this.eveid;
+            var formdata = new FormData
+            formdata.append('id', defId)
             this.$confirm('是否确认删除日程?', "警告", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning"
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
             }).then(function() {
-              var formdata = new FormData
-              formdata.append('id', defId)
               return delSchenule(formdata);
             }).then(() => {
-              this.toList();
+              this.reload();
               this.msgSuccess("删除成功");
+              this.schedule1 = false;
             }).catch(function() {});
 
 
+
           },
           resetForm() {
             this.formData=[];