Merge branch 'master' of C:\Users\yinet\Desktop\oa工作流\YinetOASystemWeb with conflicts.

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

@@ -75,8 +75,6 @@
     name: "schedule",
     components: {
       FullCalendar
-
-
     },
         data(){
             return {
@@ -155,7 +153,7 @@
     created() {
       this.toList();
     },
-        methods:{
+     methods:{
       toList (){
         selectList(this.formData).then(response => {
           console.log(response.rows)
@@ -184,9 +182,19 @@
           //   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);