Merge branch 'master' of https://gitee.com/elegant_wings/dbd-meeting-html

src/api/admin/meeting/showroomRecord.js

@@ -11,6 +11,14 @@ export function getShowroomRecordList (parameter) {
     params: parameter
   })
 }
+export function get (id) {
+  return axios({
+    url: api.showroomRecord + '/get/'+id,
+    method: 'get',
+    params: {}
+  })
+}
+
 
 export function saveShowroomRecord (parameter) {
   return axios({

src/views/admin/meeting/modules/ShowroomRecordModal.vue

@@ -51,7 +51,7 @@
           <a-select-option value="展厅(2楼)">
             展厅(2楼)
           </a-select-option>
-          <a-select-option value="公共服务配套区(15楼)">
+          <a-select-option value="公共服务配套区(15 楼)">
             公共服务配套区(15楼)
           </a-select-option>
           <a-select-option value="中电郑州、生态企业(16楼)">
@@ -88,7 +88,7 @@
                   <a-input
                     placeholder="请填职位"
                     v-decorator="[
-                  `${title}Age[${item}]`,
+                  `${title}Job[${item}]`,
                   {
                     initialValue: arr[item] ? arr[item].job : undefined,
                     rules: [{ required: true, message: '请填职位' }]
@@ -134,13 +134,13 @@
         </a-select>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="讲解需求">
-        <a-switch v-decorator="['explainNeedType',{rules: [{ required: true, message: '讲解需求'}]}]" />
+        <a-switch   v-decorator="['explainNeedType',{valuePropName: 'checked' , rules: [{ required: true, message: '讲解需求'}]}]" />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会议室需求">
-        <a-switch v-decorator="['meetingNeedType',{rules: [{ required: true, message: '会议室需求'}]}]" />
+        <a-switch v-decorator="['meetingNeedType',{valuePropName: 'checked' ,rules: [{ required: true, message: '会议室需求'}]}]" />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="摄影需求">
-        <a-switch v-decorator="['photographType',{rules: [{ required: true, message: '摄影需求'}]}]" />
+        <a-switch v-decorator="['photographType',{valuePropName: 'checked' ,rules: [{ required: true, message: '摄影需求'}]}]" />
       </a-form-item>
     </a-form>
   </a-modal>
@@ -149,7 +149,7 @@
 
 </template>
 <script>
-    import {saveShowroomRecord} from '@/api/admin/meeting/showroomRecord'
+    import {saveShowroomRecord,get} from '@/api/admin/meeting/showroomRecord'
     import pick from 'lodash.pick'
     import storage from 'store'
     import moment from 'moment'
@@ -180,7 +180,7 @@
 
   data () {
     return {
-      id: 0,
+      ids: 0,
       keysList: [],
       recordOptions:[],
       visible: false,
@@ -228,8 +228,9 @@
     },
     // 新增一行
     addRow () {
-      this.id = this.id + 1
+      this.ids = this.ids + 1
-      this.keysList = this.keysList.concat(this.id)
+      this.keysList = this.keysList.concat(this.ids)
+      console.log(this.keysList)
     },
 
     moment,
@@ -246,19 +247,56 @@
     edit (record) {
       this.mdl = Object.assign(record)
       this.visible = true
-      this.$nextTick(() => {
+      get(record.id).then(res =>{
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'showroomId', 'userId', 'title', 'stauts', 'reservationNumber', 'cancelTime', 'cancelResaon', 'startTime', 'endDate', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'remake'))
+        res.visitArea =res.visitArea.split(",")
+        let persons = JSON.parse(res.persons)
+        let names =persons.map(item=> item.name)
+        let jobs =persons.map(item=> item.job)
+        let phones =persons.map(item=> item.phone)
+        this.form.setFieldsValue({
+          visitType:res.visitType.toString(),
+          visitArea:res.visitArea,
+          Name:names,
+          Job:jobs,
+          Phone:phones
+        })
+
       })
+
+
+
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'showroomId', 'userId', 'title', 'stauts',"explainNeedType","meetingNeedType","photographType",
+          'reservationNumber', 'cancelTime', 'cancelResaon', 'startTime', 'endDate', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'remake'))
+      })
+
+
+
     },
     handleSubmit (e) {
-      console.log(this.keysList)
-
-
       e.preventDefault()
       this.form.validateFields((err, values) => {
+
         if (!err) {
           console.log('Received values of form: ', values)
           this.confirmLoading = true
+          const partOneArr = [];
+          values[`Name`].forEach((item, index) => {
+            console.log(index)
+            const obj = {
+              id:new Date().getTime(),
+              name: item,
+              job: values[`Job`][index],
+              phone: values[`Phone`][index]
+            }
+            partOneArr.push(obj)
+          })
+          values.persons = JSON.stringify(partOneArr)
+          values.visitArea =values.visitArea.join(",")
+
+          values.explainNeedType = values.explainNeedType === true ? 1 : 0
+
+
           saveShowroomRecord(values).then(res => {
             if (res.code === 0) {
               this.$message.success('保存成功')