From c5518047c117ce06272cfb56b4925086d26385f2 Mon Sep 17 00:00:00 2001
From: chendaze <1824191732@qq.com>
Date: Thu, 28 Mar 2024 15:06:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86PC=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin/customer.js                          | 14 +++++++++++++-
 src/api/admin/meeting/equipment.js                 |  9 +++++++++
 src/views/admin/CustomerEdit.vue                   |  8 ++++----
 src/views/admin/meeting/modules/EquipmentModal.vue | 14 ++++++++------
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/api/admin/customer.js b/src/api/admin/customer.js
index a9b7e51..28bafe6 100644
--- a/src/api/admin/customer.js
+++ b/src/api/admin/customer.js
@@ -42,7 +42,19 @@ export function getStaffListByUser (parameter) {
 
 export function updateStaff (parameter) {
   return axios({
-    url: api.icsCustomerStaff +  '/update',
+    url: api.icsCustomerStaff +  '/updateStaff',
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+
+export function updateStaffByCustomer (parameter) {
+  return axios({
+    url: api.icsCustomerStaff +  '/updateStaffByCustomer',
     method: 'post',
     data: parameter,
     headers: {
diff --git a/src/api/admin/meeting/equipment.js b/src/api/admin/meeting/equipment.js
index bf0f487..358c4cb 100644
--- a/src/api/admin/meeting/equipment.js
+++ b/src/api/admin/meeting/equipment.js
@@ -20,6 +20,15 @@ export function get(id) {
   })
 }
 
+export function getRoomList (parameter) {
+  return axios({
+    url: api.equipment + '/getRoomList',
+    method: 'get',
+    params: parameter
+  })
+}
+
+
 export function recordByDeviceId(id) {
   return axios({
     url: api.equipment + '/recordByDeviceId/' + id,
diff --git a/src/views/admin/CustomerEdit.vue b/src/views/admin/CustomerEdit.vue
index 9ce6848..91709ac 100644
--- a/src/views/admin/CustomerEdit.vue
+++ b/src/views/admin/CustomerEdit.vue
@@ -323,9 +323,8 @@ import {
   saveCustomer,
   getCustomer,
   getQiXinBasicInfo,
-  getCustomerContactsList,
   getStaffList,
-  delCustomerContacts
+  updateStaffByCustomer
 } from '@/api/admin/customer'
 import {
   getFloorList,
@@ -607,11 +606,12 @@ export default {
     },
     // 删除联系人
     handleDeleteContact(contactInfo) {
-      delCustomerContacts({ ids: contactInfo.id }).then(res => {
+      console.log(contactInfo)
+      // contactInfo.
+      updateStaffByCustomer(contactInfo).then(res => {
         if (res.code === 0) {
           this.$message.success('删除成功')
           this.deleteVisible = false
-          this.deletingContact = {}
           this.getContastsList()
         } else {
           this.$message.error(res.msg)
diff --git a/src/views/admin/meeting/modules/EquipmentModal.vue b/src/views/admin/meeting/modules/EquipmentModal.vue
index 00b6bae..3b33085 100644
--- a/src/views/admin/meeting/modules/EquipmentModal.vue
+++ b/src/views/admin/meeting/modules/EquipmentModal.vue
@@ -128,9 +128,9 @@
   </a-modal>
 </template>
 <script>
-import { saveEquipment, get,recordByDeviceId } from '@/api/admin/meeting/equipment'
+import { saveEquipment, get,recordByDeviceId,getRoomList } from '@/api/admin/meeting/equipment'
 import pick from 'lodash.pick'
-import { getFloorList, getRoomListByFloorId } from '@/api/admin/meeting/roomContent'
+import { getFloorList } from '@/api/admin/meeting/roomContent'
 import storage from 'store'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 
@@ -189,10 +189,7 @@ export default {
       })
     },
     getRoomList(value) {
-      let param = {
-        'buildingDetailId': value
-      }
-      getRoomListByFloorId(param).then((res) => {
+      getRoomList({ 'buildingDetailId': value, }).then((res) => {
         this.roomList = res.data
       })
     },
@@ -255,6 +252,11 @@ export default {
       if (this.mdl.pic) {
         this.imageUrl = process.env.VUE_APP_API_BASE_URL + this.mdl.pic
       }
+
+      getRoomList({ 'buildingDetailId': this.mdl.buildId, }).then((res) => {
+        this.roomList = res.data
+      })
+
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.mdl, 'id', 'type', 'equipmentName', 'status', 'createDate', 'equipmentNum','buildId','ip','roomId', 'pic', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))