diff --git a/src/api/inconmeMeetingApi.js b/src/api/inconmeMeetingApi.js
new file mode 100644
index 0000000..3f1e061
--- /dev/null
+++ b/src/api/inconmeMeetingApi.js
@@ -0,0 +1,8 @@
+import {getAction} from "@api/manage";
+
+// 通过用户id获取用户信息
+const getUserInfo = (params) => getAction('/sys/user/queryById',params)
+
+export {
+  getUserInfo
+}
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index d2408d2..81ee7b0 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -36,6 +36,7 @@
           <a-col :xl="12" :md="12" :sm="24">
             <a-form-item label="召开时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-range-picker
+                  @change="changeConvokeTime"
                   format="YYYY-MM-DD HH:mm:00"
                   :show-time="{ format: 'HH:mm' }"
                   v-decorator="['convokeTime']"
@@ -63,7 +64,7 @@
               <a-range-picker
                   format="YYYY-MM-DD HH:mm:00"
                   :show-time="{ format: 'HH:mm' }"
-                  v-decorator="['startSignInTime',validatorRules.convokeTime]"
+                  v-decorator="['startSignInTime']"
                   :trigger-change="true"
                   style="width: 100%"/>
             </a-form-item>
@@ -71,14 +72,14 @@
 
           <a-col :xl="6" :md="8" :sm="24">
             <a-form-item label="会议通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-upload v-decorator="[ 'estimatedNumber']"></j-upload>
+              <j-upload :return-id="true" v-decorator="[ 'meetingFiles']"></j-upload>
             </a-form-item>
           </a-col>
 
           <a-col :xl="6" :md="8" :sm="24">
             <a-form-item label="报名截止时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择报名截止时间" style="width: 100%;" v-decorator="['beginDate']" :trigger-change="true"
-                      date-format="YYYY-MM-DD"/>
+              <j-date placeholder="请选择报名截止时间" style="width: 100%;" v-decorator="['registerDeadline']" :trigger-change="true"
+                      date-format="YYYY-MM-DD HH:mm:ss" :show-time="true" />
             </a-form-item>
           </a-col>
 
@@ -101,7 +102,7 @@
               <j-area-linkage
                   type="cascader"
                   placeholder="请选择省市"
-                  v-decorator="['meetingContent']"
+                  v-decorator="['convokeLocale']"
               ></j-area-linkage>
             </a-form-item>
           </a-col>
@@ -188,6 +189,7 @@
           <a-col :xl="6" :md="8" :sm="24">
             <a-form-item label="会议负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <select-principal placeholder="请选择会议负责人"
+                                @change="selectPerson"
                                 v-decorator="['directorId',validatorRules.directorId]"></select-principal>
             </a-form-item>
           </a-col>
@@ -275,12 +277,17 @@
 </template>
 
 <script>
+import {getUserInfo} from "@api/inconmeMeetingApi";
+import {httpAction} from "@api/manage";
 import JDictSelectTag from "@comp/dict/JDictSelectTag";
 import JYearDate from "@comp/jero/JYearDate";
 import JUpload from "@comp/jero/JUpload";
-import JDate from "@comp/tools/JDate";
+// import JDate from "@comp/tools/JDate";
+import JDate from "@comp/jero/JDate";
 import SelectPrincipal from "@comp/company/SelectPrincipal";
 import JAreaLinkage from "@comp/jero/JAreaLinkagePca";
+import AreaPca from "@comp/_util/AreaPca";
+import moment from 'moment'
 
 export default {
   name: "AddOrDetailMeet",
@@ -299,12 +306,7 @@ export default {
       confirmLoading: false,
       visible: false,
       form: this.$form.createForm(this),
-      model: {
-        hotelList: [{
-          contactPerson: '',
-          telephoneNumber: ''
-        }]
-      },
+      model: {},
       labelCol: {
         xs: {span: 24},
         sm: {span: 6}
@@ -329,10 +331,16 @@ export default {
       url: {
         add: "/meeting/payMeeting/add",
         edit: "/meeting/payMeeting/edit",
-      }
+      },
+      // 召开时间
+      newConvokeTime:'',
     }
   },
+  created() {
+    this.pcaData = new AreaPca()
+  },
   methods: {
+    moment,
     /*
     *  发布会议
     * */
@@ -343,7 +351,10 @@ export default {
           let httpurl = ''
           let method = 'post'
           httpurl = this.url.add
-          const formData = Object.assign(this.model, values)
+          let placeName = values.convokeLocale
+          const formData = Object.assign(this.model, values,{ placeName: this.getPcaText(placeName) })
+          formData.beginTime = this.newConvokeTime[0]
+          formData.endTime = this.newConvokeTime[1]
           console.log('表单提交数据', formData)
           httpAction(httpurl, formData, method).then((res) => {
             if (res.success) {
@@ -377,6 +388,28 @@ export default {
     * */
     changeMeetingType(val) {
       this.meetingType = val
+      if(val === '2'){
+        this.model.hotelList =[{
+          contactPerson: '',
+          telephoneNumber: ''
+        }]
+      }else {
+        if(this.model.hasOwnProperty('hotelList')){
+          delete this.model.hotelList
+        }
+      }
+    },
+    /*
+    * 会议负责人
+    * */
+    selectPerson(val){
+      getUserInfo({id:val}).then(res => {
+        if(res.success){
+          this.$nextTick( () => {
+            this.form.setFieldsValue({directorPhone:res.result.phone})
+          })
+        }
+      })
     },
     /*
     * 添加酒店联系人
@@ -421,6 +454,18 @@ export default {
         hotelList: hotelList
       })
     },
+    /*
+    *  召开地点吗转换
+    * */
+    getPcaText(code) {
+      return this.pcaData.getText(code)
+    },
+    /*
+    * 召开时间转化
+    * */
+    changeConvokeTime(date,dateString){
+      this.newConvokeTime = dateString
+    }
   }
 }
 </script>