新增了用户企业关联表

src/api/admin/meeting/staffCustomer.js

@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+  staffCustomer: '/meeting/staffCustomer'
+}
+
+export function getStaffCustomerList (parameter) {
+  return axios({
+    url: api.staffCustomer + '/list',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function saveStaffCustomer (parameter) {
+  return axios({
+    url: api.staffCustomer + (parameter.id > 0 ? '/update' : '/save'),
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function delStaffCustomer (parameter) {
+  return axios({
+    url: api.staffCustomer + '/remove',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export const staffCustomerExport = api.staffCustomer + '/export'

src/views/admin/meeting/ShowroomRecordList.vue

@@ -34,6 +34,9 @@
       <span slot='visitType' slot-scope='text'>
         {{ text | visitType }}
       </span>
+      <span slot='status' slot-scope='text,record'>
+        {{ record.status === 1?'已通过':'已取消' }}
+      </span>
       <span slot='persons' slot-scope='text,record'>
         <a @click='handlePersons(record)'>查看</a>
       </span>
@@ -43,6 +46,9 @@
         <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
         <a-divider type="vertical" />
         <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
+        <a-divider type="vertical" />
+        <a-tag @click='verifyReject(record.id)' v-if='record.status == 0 || record.status == 1'
+              color='volcano'>驳回</a-tag>
       </span>
     </s-table>
     <showroomRecord-modal ref="modal" @ok="handleOk"/>
@@ -55,13 +61,28 @@
                :data-source='personData'>
       </a-table>
     </a-modal>
+
+    <a-modal
+      title='驳回'
+      :visible='rejectModalVisible'
+      :confirm-loading='rejectConfirmLoading'
+      @ok='rejectHandleOk'
+      @cancel='rejectHandleCancel'
+      cancelText='取消'
+      okText='确认'
+    >
+      <div class='rejectView'>
+        <div class='label'>驳回原因</div>
+        <a-input class='content' v-model='rejectContent' placeholder='请输入驳回原因' />
+      </div>
+    </a-modal>
   </a-card>
 </template>
 
 <script>
     import {STable} from '@/components'
 
-    import {delShowroomRecord,getShowroomRecordList} from '@/api/admin/meeting/showroomRecord'
+    import {delShowroomRecord,getShowroomRecordList,saveShowroomRecord} from '@/api/admin/meeting/showroomRecord'
     import ShowroomRecordModal from './modules/ShowroomRecordModal.vue'
     import {checkPermission} from '@/utils/permissions'
     import { getDictArray } from '@/utils/dict'
@@ -85,6 +106,8 @@
       },
       form: this.$form.createForm(this),
       mdl: {},
+      rejectModalVisible: false,
+      rejectConfirmLoading: false,
       // 高级搜索 展开/关闭
       advanced: false,
       // 查询参数
@@ -137,9 +160,15 @@
           dataIndex: 'endDate',
           sorter: true
         },
+        {
+          title: '预约状态',
+          dataIndex: 'status',
+          scopedSlots: { customRender: 'status' }
+
+        },
         {
           title: '操作',
-          width: '200px',
+          width: '300px',
           dataIndex: 'action',
           scopedSlots: { customRender: 'action' }
         }
@@ -157,6 +186,9 @@
     }
   },
   filters: {
+
+
+
     visitType(Type) {
       return typeMap[Type].text
     },
@@ -168,6 +200,48 @@
     })
   },
   methods: {
+
+    // 展厅预约驳回
+    verifyReject(id) {
+      this.rejectModalId = id
+      this.rejectModalVisible = true
+    },
+
+    rejectHandleOk() {
+      console.log('rejectHandleOk', this.rejectContent)
+      let id = this.rejectModalId
+      let cancelResaon = this.rejectContent
+      // 校验必填
+      if (!this.rejectContent) {
+        this.$message.error('驳回原因不能为空!')
+        return
+      }
+      // 设置确认加载状态
+      this.rejectConfirmLoading = true
+      // 调用接口
+      saveShowroomRecord({
+        id,
+        status: 4,
+        rejectContent:this.rejectContent,
+      }).then(res => {
+        if (res.code === 0) {
+          this.$message.success('操作成功')
+          this.rejectHandleCancel()
+          this.handleOk()
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.selectedRowKeys = []
+      })
+    },
+
+    rejectHandleCancel() {
+      this.rejectModalId = null
+      this.rejectModalVisible = false
+      this.rejectConfirmLoading = false
+      this.rejectContent = null
+    },
+
     handleInfo(record){
       this.$router.push({ name: 'showroomRecordInfo', query: { id: record.id } })
 
@@ -183,6 +257,8 @@
       console.log(record.persons)
       this.personData =  JSON.parse(record.persons)
     },
+
+
     itemHandleOk(){
 
     },

src/views/admin/meeting/StaffCustomerList.vue

@@ -0,0 +1,161 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="48">
+          <a-col :md="5" :sm="15">
+            <a-form-item label="企业id">
+              <a-input placeholder="请输入企业id" v-model="queryParam.icsCustomerId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="用户id">
+              <a-input placeholder="请输入用户id" v-model="queryParam.staffId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="园区ID">
+              <a-input placeholder="请输入园区ID" v-model="queryParam.parkId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <a-button v-if="addEnable" type="primary" icon="plus" @click="$refs.modal.add()">新建</a-button>
+      <a-dropdown v-if="removeEnable&&selectedRowKeys.length > 0">
+        <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
+      </a-dropdown>
+    </div>
+    <s-table
+      size="default"
+      ref="table"
+      rowKey="id"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      :columns="columns"
+      :data="loadData"
+    >
+      <span slot="action" slot-scope="text, record">
+        <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
+        <a-divider type="vertical" />
+        <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
+      </span>
+    </s-table>
+    <staffCustomer-modal ref="modal" @ok="handleOk"/>
+  </a-card>
+</template>
+
+<script>
+    import {STable} from '@/components'
+
+    import {delStaffCustomer,getStaffCustomerList} from '@/api/admin/meeting/staffCustomer'
+    import StaffCustomerModal from './modules/StaffCustomerModal.vue'
+    import {checkPermission} from '@/utils/permissions'
+
+    export default {
+  name: 'TableList',
+  components: {
+    STable,
+    StaffCustomerModal
+  },
+  data () {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      form: this.$form.createForm(this),
+      mdl: {},
+      // 高级搜索 展开/关闭
+      advanced: false,
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        {
+          title: '企业id',
+          dataIndex: 'icsCustomerId'
+        },
+        {
+          title: '用户id',
+          dataIndex: 'staffId'
+        },
+        {
+          title: '园区ID',
+          dataIndex: 'parkId'
+        },
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getStaffCustomerList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      addEnable: checkPermission('meeting:staffCustomer:add'),
+      editEnabel: checkPermission('meeting:staffCustomer:edit'),
+      removeEnable: checkPermission('meeting:staffCustomer:remove')
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  methods: {
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    },
+    handleAdd () {
+      this.$refs.modal.add()
+    },
+    handleEdit (record) {
+      this.$refs.modal.edit(record)
+    },
+    handleOk () {
+      this.$refs.table.refresh(true)
+      console.log('handleSaveOk')
+    },
+    delByIds (ids) {
+      delStaffCustomer({ ids: ids.join(',') }).then(res => {
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          this.handleOk()
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.selectedRowKeys = []
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>

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

@@ -208,7 +208,9 @@ export default {
         },
         {
           title: '开门方式',
-          dataIndex: 'type'
+          dataIndex: 'type',
+          scopedSlots: {customRender:  'type'}
+
         },
         {
           title: '开门人',

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

@@ -0,0 +1,118 @@
+<template>
+  <a-modal
+    title="操作"
+    style="top: 20px;"
+    :width="800"
+    v-model="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+  >
+    <a-form :form="form">
+      <a-form-item style="display:none">
+        <a-input v-decorator="['id']"/>
+      </a-form-item>
+      <a-form-item style="display:none">
+        <a-input v-decorator="['version']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="企业id">
+        <a-input placeholder="企业id" v-decorator="['icsCustomerId']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="用户id">
+        <a-input placeholder="用户id" v-decorator="['staffId']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建时间">
+        <a-input placeholder="创建时间" v-decorator="['deleteFlag']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建时间">
+        <a-input placeholder="创建时间" v-decorator="['createBy']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="租户ID">
+        <a-input placeholder="租户ID" v-decorator="['tenantId']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="园区ID">
+        <a-input placeholder="园区ID" v-decorator="['parkId']"/>
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+    import {saveStaffCustomer} from '@/api/admin/meeting/staffCustomer'
+    import pick from 'lodash.pick'
+
+    export default {
+  name: 'StaffCustomerModal',
+  props: {
+  },
+  components: {
+  },
+  data () {
+    return {
+      visible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      confirmLoading: false,
+      mdl: {},
+      form: this.$form.createForm(this)
+    }
+  },
+  beforeCreate () {
+  },
+  created () {
+  },
+  methods: {
+    add () {
+      this.form.resetFields()
+      this.edit({ id: 0 })
+    },
+    edit (record) {
+      this.mdl = Object.assign(record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'icsCustomerId', 'staffId', 'createTime', 'deleteFlag', 'createBy', 'tenantId', 'parkId'))
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+          this.confirmLoading = true
+          saveStaffCustomer(values).then(res => {
+            if (res.code === 0) {
+              this.$message.success('保存成功')
+              this.$emit('ok')
+              this.visible = false
+            } else {
+              this.$message.error(res.msg)
+            }
+          }).catch(() => {
+            this.$message.error('系统错误，请稍后再试')
+          }).finally(() => {
+            this.confirmLoading = false
+          })
+        }
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>

src/views/admin/modules/CustomerContactsModal.vue

@@ -238,6 +238,9 @@ export default {
       if (this.mdl.photo) {
         this.photoImageUrl = process.env.VUE_APP_API_BASE_URL + this.mdl.photo
       }
+      if (this.mdl.avatar) {
+        this.avatarImageUrl = process.env.VUE_APP_API_BASE_URL + this.mdl.avatar
+      }
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.mdl, 'id','name','username','mobile','gender',
@@ -248,10 +251,9 @@ export default {
       e.preventDefault()
       this.form.validateFields((err, values) => {
         if (!err) {
-          // values.customerId = this.customerId
           console.log('Received values of form: ', values)
-          values.id = this.staffId
+          // values.id = this.staffId
-          console.log(values)
+          console.log(this.customerId)
           this.confirmLoading = true
           updateStaff(values).then(res => {
             if (res.code === 0) {

src/views/system/modules/UserModal.vue

@@ -106,7 +106,7 @@
 </template>
 <script>
 import { getRoleAll, saveUser, getUser } from '@/api/system'
-import { saveCustomerContacts, getStaffList, updateStaff, getStaffListByUser } from '@/api/admin/customer'
+import { saveCustomerContacts, getStaffList,  getStaffListByUser } from '@/api/admin/customer'
 
 import {
   getCustomerList