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

src/api/admin/customer.js

@@ -24,6 +24,16 @@ export function getStaffList (parameter) {
   })
 }
 
+export function selectCustomerStaffList (parameter) {
+  return axios({
+    url: api.icsCustomerStaff + '/selectCustomerStaffList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+
+
 export function getStaffListNotId (parameter) {
   return axios({
     url: api.icsCustomerStaff + '/getStaffListNotId',

src/views/admin/CustomerEdit.vue

@@ -285,16 +285,16 @@
             </span>
           </a-table>
         </a-tab-pane>
-        <a-tab-pane tab='联系人' key='3' v-if='$route.query.customerId'>
+        <a-tab-pane tab='企业员工管理' key='3' v-if='$route.query.customerId'>
           <div style='margin: 10px'>
             <a-button type='primary' @click='$refs.contactModal.add({ customerId: $route.query.customerId })'>
-              新建联系人
+              新建企业员工
             </a-button>
           </div>
           <a-table :pagination='false' :columns='contactsItemColumns' :dataSource='contactsItemData' rowKey='id'>
             <template slot='operation' slot-scope='text, record'>
-              <!--              <a-button type="link" @click="$refs.contactModal.add(record)">编辑</a-button>-->
-              <!--              <a-divider type="vertical" />-->
+                            <a-button type="link" @click="$refs.contactModal.add(record)">编辑</a-button>
+                            <a-divider type="vertical" />
               <a-popconfirm @confirm='handleDeleteContact(record)'>
                 <template slot='title'>
                   <span>确定删除 {{ record.name }} 吗？</span>
@@ -324,6 +324,7 @@ import {
   getCustomer,
   getQiXinBasicInfo,
   getStaffList,
+  selectCustomerStaffList,
   updateStaffByCustomer
 } from '@/api/admin/customer'
 import {
@@ -587,7 +588,7 @@ export default {
       let param = {
         customerId: this.$route.query.customerId
       }
-      getStaffList(param).then(res => {
+      selectCustomerStaffList(param).then(res => {
         this.contactsItemData = res.rows
       })
     },

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

@@ -103,13 +103,16 @@ export default {
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.mdl, 'id', 'roomContentId', 'userId', 'ticketId', 'customerId', 'title', 'stauts', 'isAfterSale', 'oderNumber', 'orderMoney', 'cancelTime', 'cancelResaon', 'visitType', 'explainNeedType', 'meetingNeedType', 'meetingId', 'photographType', 'startTime', 'endTime', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'remake'))
       })
-      get(record.id).then(res => {
-        this.form.setFieldsValue({
-          endDate: res.endDate,
-          duration: res.duration
+      if (record.id !== 0){
+        get(record.id).then(res => {
+          this.form.setFieldsValue({
+            endDate: res.endDate,
+            duration: res.duration
 
+          })
         })
-      })
+      }
+
     },
     handleSubmit(e) {
       e.preventDefault()

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

@@ -289,6 +289,8 @@
           values.visitArea =values.visitArea.join(",")
 
           values.explainNeedType = values.explainNeedType === true ? 1 : 0
+          values.meetingNeedType = values.meetingNeedType === true ? 1 : 0
+          values.photographType = values.photographType === true ? 1 : 0
 
 
           saveShowroomRecord(values).then(res => {

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

@@ -24,7 +24,7 @@
         </a-select>
       </a-form-item>
       <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='被访人姓名'>
-        <a-select v-decorator="['intervieweeId',{rules: [{ required: true, message: '请选择被访人姓名' }]}]"
+        <a-select v-decorator="['userId',{rules: [{ required: true, message: '请选择被访人姓名' }]}]"
                   placeholder='请选择被访人姓名'
                   @change='getPersonData'>
           <a-select-option v-for='item in personList' :key='item.id' :value='item.id'>

src/views/admin/modules/CustomerContactsModal.vue

@@ -14,25 +14,72 @@
       <a-form-item style="display:none">
         <a-input v-decorator="['customerId']" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="请选择手机号">
-<!--        <a-input placeholder="联系人" v-decorator="['name', {rules: [{required: true, message: '请输入联系人'}]}]"/>-->
-
-        <a-select
-          show-search
-          v-decorator="['mobile', {rules: [{required: true, message: '请选择手机号码'}]}]"
-          placeholder="请选择手机号码"
-          style="width: 200px"
-          :default-active-first-option="false"
-          :show-arrow="false"
-          :filter-option="false"
-          :not-found-content="null"
-          @search="handleSearch"
-          @change="handleChange"
-        >
-          <a-select-option v-for="d in data" :key="d.id">
-            {{ d.mobile }}
-          </a-select-option>
-        </a-select>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='姓名'>
+          <a-input placeholder='姓名' v-decorator="['name', {rules: [{required: true, message: '请输入姓名'}]}]" />
+        </a-form-item>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='电话'>
+          <a-input placeholder='电话' v-decorator="['mobile', {rules: [{required: true, message: '请输入电话'}]}]" />
+        </a-form-item>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='用户性别'>
+          <a-radio-group @change='onChange' v-decorator="['gender',{rules: [{required: true, message: '请选择性别'}]}]">
+            <a-radio :value="'0'">男</a-radio>
+            <a-radio :value="'1'">女</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='照片'>
+          <a-upload
+            v-decorator="['photo' ,{rules: [{required: true, message: '请上传照片'}]}]"
+            list-type='picture-card'
+            class='avatar-uploader'
+            :show-upload-list='false'
+            :action='uploadUrl'
+            :headers='headers'
+            :before-upload='photoBeforeUpload'
+            @change='photoHandleChange'
+          >
+            <img v-if='photoImageUrl' :src='photoImageUrl' style='width: 102px; height: 102px' />
+            <div v-else>
+              <a-icon :type="photoLoading ? 'loading' : 'plus'" />
+              <div class='ant-upload-text'> 上传</div>
+            </div>
+          </a-upload>
+        </a-form-item>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='头像'>
+          <a-upload
+            v-decorator="['avatar']"
+            list-type='picture-card'
+            class='avatar-uploader'
+            :show-upload-list='false'
+            :action='uploadUrl'
+            :headers='headers'
+            :before-upload='avatarBeforeUpload'
+            @change='avatarHandleChange'
+          >
+            <img v-if='avatarImageUrl' :src='avatarImageUrl' style='width: 102px; height: 102px' />
+            <div v-else>
+              <a-icon :type="avatarLoading ? 'loading' : 'plus'" />
+              <div class='ant-upload-text'> 上传</div>
+            </div>
+          </a-upload>
+        </a-form-item>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='昵称'>
+          <a-input placeholder='昵称' v-decorator="['username']" />
+        </a-form-item>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='身份证号'>
+          <a-input placeholder='身份证号' v-decorator="['cardNo']" />
+        </a-form-item>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='地址'>
+          <a-input placeholder='地址' v-decorator="['address' ,{rules: [{required: true, message: '请输入地址'}]}]" />
+        </a-form-item>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='邮箱'>
+          <a-input placeholder='邮箱' v-decorator="['email']" />
+        </a-form-item>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='学历'>
+          <a-input placeholder='学历' v-decorator="['degree']" />
+        </a-form-item>
+        <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='紧急联系人'>
+          <a-input placeholder='紧急联系人' v-decorator="['urgent']" />
+        </a-form-item>
 
       </a-form-item>
 <!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">-->