绑定投资人

src/api/system/bindRecord.js

@@ -10,10 +10,36 @@ export function listBindRecord(query) {
 }
 
 // 查询设备绑定记录详细
-export function getBindRecord(bindRecordId) {
+export function getBindRecord(recordId) {
   return request({
-    url: '/system/bindRecord/' + bindRecordId,
+    url: '/system/bindRecord/' + recordId,
     method: 'get'
   })
 }
 
+// 新增设备绑定记录
+export function addBindRecord(data) {
+  return request({
+    url: '/system/bindRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备绑定记录
+export function updateBindRecord(data) {
+  return request({
+    url: '/system/bindRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备绑定记录
+export function delBindRecord(recordId) {
+  return request({
+    url: '/system/bindRecord/' + recordId,
+    method: 'delete'
+  })
+}
+

src/api/system/device.js

@@ -122,13 +122,25 @@ export function switchDevice(deviceId, open) {
 }
 
 // 强制解绑设备
-export function unbind(deviceId) {
+export function unbindInvestor(deviceId) {
   return request({
-    url: `/system/device/${deviceId}/unbind`,
+    url: `/system/device/${deviceId}/unbindInvestor`,
     method: 'delete'
   })
 }
 
+// 投资人绑定设备
+export function bindInvestor(deviceId, userId) {
+  return request({
+    url: `/system/device/bindInvestor`,
+    method: 'put',
+    params: {
+      deviceId,
+      userId
+    }
+  })
+}
+
 // 更新设备服务费
 export function updateDeviceServiceRate(deviceId, serviceRate) {
   return request({

src/components/Business/Dept/DeptTreeSelect.vue

@@ -71,7 +71,6 @@ export default {
       };
     },
     onSelect(data) {
-      console.log('data', data)
       this.$emit('select', data)
     }
   }

src/views/system/bindRecord/index.vue

@@ -0,0 +1,402 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable @change="handleQuery">
+          <el-option
+            v-for="dict in dict.type.bind_record_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="FieldName.AGENT" prop="agentName">
+        <el-input
+          v-model="queryParams.agentName"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="FieldName.INVESTOR" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="FieldName.BIZ" prop="bizName">
+        <el-input
+          v-model="queryParams.bizName"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="deviceName" v-if="notHasView(views.device)">
+        <el-input
+          v-model="queryParams.deviceName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:bindRecord:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['system:bindRecord:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:bindRecord:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:bindRecord:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="bindRecordList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <template v-for="column of showColumns">
+        <el-table-column
+            :key="column.key"
+            :label="column.label"
+            :prop="column.key"
+            :align="column.align"
+            :min-width="column.minWidth"
+            :sort-orders="orderSorts"
+            :sortable="column.sortable"
+            :show-overflow-tooltip="column.overflow"
+            :width="column.width"
+        >
+          <template slot-scope="d">
+            <template v-if="column.key === 'recordId'">
+              {{d.row[column.key]}}
+            </template>
+            <template v-else-if="column.key === 'type'">
+              <dict-tag :options="dict.type.bind_record_type" :value="d.row[column.key]"/>
+            </template>
+            <template v-else-if="column.key === 'userId'">
+              <user-link :id="d.row.userId" :name="d.row.userName"/>
+            </template>
+            <template v-else-if="column.key === 'bizId'">
+              <user-link :id="d.row.bizId" :name="d.row.bizName"/>
+            </template>
+            <template v-else-if="column.key === 'agentId'">
+              <user-link :id="d.row.agentId" :name="d.row.agentName"/>
+            </template>
+            <template v-else-if="column.key === 'deviceId'">
+              <device-link :id="d.row.deviceId" :text="d.row.deviceName"/>
+              (<device-link :id="d.row.deviceId" :text="d.row.deviceNo"/>)
+            </template>
+            <template v-else>
+              {{d.row[column.key]}}
+            </template>
+          </template>
+        </el-table-column>
+      </template>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:bindRecord:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['system:bindRecord:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改设备绑定记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备id" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入设备id" />
+        </el-form-item>
+        <el-form-item label="用户id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option
+              v-for="dict in dict.type.bind_record_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBindRecord, getBindRecord, delBindRecord, addBindRecord, updateBindRecord } from "@/api/system/bindRecord";
+import { $showColumns, $view } from '@/utils/mixins'
+import UserLink from '@/components/Business/SmUser/UserLink.vue'
+import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
+import { FieldName } from '@/utils/constants'
+
+// 默认排序字段
+const defaultSort = {
+  prop: "createTime",
+  order: "descending"
+}
+
+export default {
+  name: "BindRecord",
+  computed: {
+    FieldName() {
+      return FieldName
+    }
+  },
+  components: { DeviceLink, UserLink },
+  mixins: [$showColumns, $view],
+  dicts: ['bind_record_type'],
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      // 字段列表
+      columns: [
+        {key: 'recordId', visible: false, label: '编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'createTime', visible: true, label: '时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'deviceId', visible: true, label: '设备', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'userId', visible: true, label: FieldName.INVESTOR, minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'bizId', visible: true, label: FieldName.BIZ, minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'agentId', visible: true, label: FieldName.AGENT, minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+      ],
+      // 排序方式
+      orderSorts: ['ascending', 'descending', null],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备绑定记录表格数据
+      bindRecordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      defaultSort,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderByColumn: defaultSort.prop,
+        isAsc: defaultSort.order,
+        deviceId: null,
+        userId: null,
+        type: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deviceId: [
+          { required: true, message: "设备id不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户id不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        type: [
+          { required: true, message: "类型不能为空", trigger: "change" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.queryParams = {
+      ...this.queryParams,
+      ...this.query
+    }
+
+    this.getList();
+  },
+  methods: {
+    /** 当排序按钮被点击时触发 **/
+    onSortChange(column) {
+      if (column.order == null) {
+        this.queryParams.orderByColumn = defaultSort.prop;
+        this.queryParams.isAsc = defaultSort.order;
+      } else {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = column.order;
+      }
+      this.getList();
+    },
+    /** 查询设备绑定记录列表 */
+    getList() {
+      this.loading = true;
+      listBindRecord(this.queryParams).then(response => {
+        this.bindRecordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        recordId: null,
+        deviceId: null,
+        userId: null,
+        createTime: null,
+        type: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.recordId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备绑定记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const recordId = row.recordId || this.ids
+      getBindRecord(recordId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备绑定记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.recordId != null) {
+            updateBindRecord(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBindRecord(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recordIds = row.recordId || this.ids;
+      this.$modal.confirm('是否确认删除设备绑定记录编号为"' + recordIds + '"的数据项？').then(function() {
+        return delBindRecord(recordIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/bindRecord/export', {
+        ...this.queryParams
+      }, `bindRecord_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/system/device/components/DeviceBindInvestor.vue

@@ -0,0 +1,71 @@
+
+<template>
+  <sm-user-dialog
+    :show.sync="dialogShow"
+    @select="onSubmit"
+    :query="userQuery"
+    :multiple="false"
+  />
+</template>
+<script>
+import SmUserDialog from '@/components/Business/SmUser/smUserDialog.vue'
+import { SmUserType } from '@/utils/constants'
+import { bindInvestor } from '@/api/system/device'
+
+export default {
+  name: "DeviceBindInvestor",
+  components: { SmUserDialog },
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    },
+    row: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    }
+  },
+  computed: {
+    SmUserType() {
+      return SmUserType
+    },
+    dialogShow: {
+      get() {
+        return this.show;
+      },
+      set(val) {
+        this.$emit('update:show', val);
+      }
+    },
+    userQuery() {
+      return {
+        type: SmUserType.INVESTOR,
+        agentId: this.row.agentId
+      }
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+    onSubmit(user) {
+      bindInvestor(this.row.deviceId, user.userId).then(res => {
+        if (res.code === 200) {
+          this.$message.success("绑定成功");
+          this.dialogShow = false;
+          this.$emit('success');
+        }
+      })
+    }
+  }
+
+}
+
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/system/device/components/bindRecord.vue

@@ -1,71 +0,0 @@
-<template>
-  <div>
-    <el-table v-loading="loading" :data="recordList">
-      <el-table-column align="center" type="index" label="#"></el-table-column>
-      <el-table-column align="center" label="时间" prop="createTime"></el-table-column>
-      <el-table-column align="center" label="用户名称" prop="userName"></el-table-column>
-    </el-table>
-
-    <pagination
-      :auto-scroll="false"
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getRecordList"
-    />
-  </div>
-</template>
-
-<script>
-import {listBindRecord} from "@/api/system/bindRecord";
-
-export default {
-  name: 'bindRecord',
-  props: {
-    // 设备id
-    deviceId: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      recordList: [], // 记录列表
-      loading: false,
-      total: 0,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        deviceId: null,
-      }
-    }
-  },
-  watch: {
-    deviceId(nv, ov) {
-      this.getRecordList(nv);
-    }
-  },
-  created() {
-    this.getRecordList(this.deviceId);
-  },
-  methods: {
-    // 获取记录列表
-    getRecordList(deviceId) {
-      if(deviceId == null) {
-        this.recordList = [];
-        this.total = 0;
-        return;
-      }
-      this.loading = true;
-      this.queryParams.deviceId = deviceId | this.deviceId;
-      listBindRecord(this.queryParams).then(response => {
-        this.recordList = response.rows;
-        this.total = response.total;
-      }).finally(() => {
-        this.loading = false;
-      });
-    }
-  }
-}
-</script>

src/views/system/device/detail.vue

@@ -131,14 +131,17 @@
 
       <el-card class="box-card">
         <el-tabs>
-          <el-tab-pane label="套餐列表" :lazy="true" v-if="checkPermi(['ss:suit:list'])">
+          <el-tab-pane label="套餐列表" :lazy="true" v-if="checkPermi(['ss:suit:list']) && deviceData.storeId != null">
-            <suit v-if="deviceData.storeId != null" :query="{storeId: deviceData.storeId}" :view="views.device"/>
+            <suit :query="{storeId: deviceData.storeId}" :view="views.device"/>
           </el-tab-pane>
           <el-tab-pane label="订单列表" :lazy="true" v-if="checkPermi(['system:bill:list'])">
             <recharge v-if="deviceData.deviceId != null" :query="{deviceId: deviceData.deviceId}" :view="views.device"/>
           </el-tab-pane>
           <el-tab-pane label="时长变化记录" :lazy="true" v-if="checkPermi(['ss:time:list'])">
-            <record-time :query="{deviceId: deviceData.deviceId}" view="device"/>
+            <record-time :query="{deviceId: deviceData.deviceId}" :view="views.device"/>
+          </el-tab-pane>
+          <el-tab-pane label="绑定记录" :lazy="true" v-if="checkPermi(['system:bindRecord:list'])">
+            <bind-record :query="{deviceId: deviceData.deviceId}" :view="views.device"/>
           </el-tab-pane>
         </el-tabs>
       </el-card>
@@ -162,14 +165,13 @@
 
 <script>
 
-import { addTime, getDevice, refreshIot, resetDevice, resetEleDevice, switchDevice, unbind } from '@/api/system/device'
+import { addTime, getDevice, refreshIot, resetDevice, resetEleDevice, switchDevice, unbindInvestor } from '@/api/system/device'
 import LineChart from "@/views/dashboard/LineChart.vue";
 import RechargeRecord from "@/views/system/device/components/rechargeRecord.vue";
 import QrCode from "@/components/QrCode/index.vue";
 import MeterRecordReport from "@/views/system/device/components/meterRecordReport.vue";
 import ReadingRecord from "@/views/system/device/components/readingRecord.vue";
 import {getWxIndexUrl} from "@/utils/wx";
-import BindRecord from "@/views/system/device/components/bindRecord.vue";
 import ResetRecord from "@/views/system/device/components/resetRecord.vue";
 import TenantList from "@/views/system/device/components/tenantList.vue";
 import SuitList from '@/views/system/device/components/suitList.vue'
@@ -187,11 +189,13 @@ import { checkPermi } from '@/utils/permission'
 import { BonusArrivalType, FieldName, ROOT_DEPT } from '@/utils/constants'
 import { mapGetters } from 'vuex'
 import DeviceUsingStatusTag from '@/views/system/device/components/DeviceUsingStatusTag.vue'
+import BindRecord from '@/views/system/bindRecord/index.vue'
 
 export default {
   name: 'Device/:deviceId',
   mixins: [$serviceType, $view],
   components: {
+    BindRecord,
     DeviceUsingStatusTag,
     Recharge,
     RechargeList,
@@ -201,7 +205,7 @@ export default {
     RecordTime,
     Suit,
     SuitList,
-    TenantList, ResetRecord, BindRecord, ReadingRecord, MeterRecordReport, QrCode, RechargeRecord, LineChart},
+    TenantList, ResetRecord, ReadingRecord, MeterRecordReport, QrCode, RechargeRecord, LineChart},
   dicts: ['sm_device_status', 'sm_device_outage_way', 'sm_device_notice_way', 'sm_model_tag', 'sm_device_online_status', 'service_type', 'bonus_arrival_type'],
   data() {
     return {
@@ -262,7 +266,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.loading = true;
-        unbind(this.deviceData.deviceId).then(res => {
+        unbindInvestor(this.deviceData.deviceId).then(res => {
           if (res.code === 200) {
             this.$message.success("操作成功");
           }

src/views/system/device/index.vue

@@ -231,6 +231,22 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:device:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-link"
+            @click="handleBindInvestor(scope.row)"
+            v-show="scope.row.userId == null"
+            v-hasPermi="['system:device:bindInvestor']"
+          >绑定{{FieldName.INVESTOR}}</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-link"
+            v-show="scope.row.userId != null"
+            @click="handleUnBindInvestor(scope.row)"
+            v-hasPermi="['system:device:unbindInvestor']"
+          >解绑{{FieldName.INVESTOR}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -267,9 +283,9 @@
           <form-col :span="span"  :label="FieldName.AGENT" prop="agentId">
             <user-input v-model="form.agentId" :query="{type: SmUserType.AGENT}" @change="onChangeSale"/>
           </form-col>
-          <form-col :span="span"  :label="FieldName.INVESTOR" prop="userId">
+<!--          <form-col :span="span"  :label="FieldName.INVESTOR" prop="userId">-->
-            <user-input v-model="form.userId" :before-open="beforeOpenUser" :query="userQuery" @change="onChangeInvestor"/>
+<!--            <user-input v-model="form.userId" :before-open="beforeOpenUser" :query="userQuery(form)" @change="onChangeInvestor"/>-->
-          </form-col>
+<!--          </form-col>-->
           <form-col :span="span"  :label="FieldName.STORE" prop="storeId">
             <store-input v-model="form.storeId" :before-open="beforeOpenStore" :query="storeQuery"/>
           </form-col>
@@ -305,6 +321,13 @@
       @select="onSubmitBatchModel"
     />
 
+    <device-bind-investor
+      ref="bindInvestor"
+      :show.sync="showCheckBindInvestor"
+      :row="row"
+      @success="getList"
+    />
+
   </div>
 </template>
 
@@ -316,7 +339,7 @@ import {
   updateDevice,
   logicDelDevice,
   updateDeviceSn,
-  batchUpdateModel, updateDeviceServiceRate
+  batchUpdateModel, updateDeviceServiceRate, unbindInvestor
 } from '@/api/system/device'
 import ModelSelect from "@/components/Business/Model/modelSelect.vue";
 import SmUserSelect from "@/components/Business/SmUser/smUserSelect.vue";
@@ -333,12 +356,14 @@ import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
 import { $serviceType, $view } from '@/utils/mixins'
 import { FieldName, SmUserType } from '@/utils/constants'
 import DeviceUsingStatusTag from '@/views/system/device/components/DeviceUsingStatusTag.vue'
+import SmUserDialog from '@/components/Business/SmUser/smUserDialog.vue'
+import DeviceBindInvestor from '@/views/system/device/components/DeviceBindInvestor.vue'
 
 export default {
   name: "Device",
   mixins: [$serviceType, $view],
   dicts: ['sm_device_online_status', 'sm_device_status', 'sm_device_outage_way','sm_device_notice_way', 'service_type', 'time_unit'],
-  components: { DeviceUsingStatusTag, DeviceLink, StoreLink, UserLink, ModelDialog, UserInput, StoreInput, SnInput, QrCode, SmUserSelect, ModelSelect},
+  components: { DeviceBindInvestor, SmUserDialog, DeviceUsingStatusTag, DeviceLink, StoreLink, UserLink, ModelDialog, UserInput, StoreInput, SnInput, QrCode, SmUserSelect, ModelSelect},
   props: {
     query: {
       type: Object,
@@ -349,6 +374,10 @@ export default {
   },
   data() {
     return {
+      // 当前选中
+      row: {},
+      // 是否展示选择绑定投资人
+      showCheckBindInvestor: false,
       // 是否展示选择型号弹窗
       showCheckModel: false,
       span: 12,
@@ -397,6 +426,9 @@ export default {
         mac: [
           { required: true, message: "设备MAC不能为空", trigger: "change" }
         ],
+        deviceNo: [
+          { required: true, message: "设备SN不能为空", trigger: "blur" }
+        ]
       },
       // 房租提醒日期选项配置
       expireDatePickerOptions: {
@@ -426,15 +458,17 @@ export default {
     },
     // 投资人查询条件
     userQuery() {
+      return (row) => {
         return {
           type: SmUserType.INVESTOR,
-        agentId: this.form.agentId
+          agentId: row.agentId
+        }
       }
     },
     // 店铺查询条件
     storeQuery() {
       return {
-        investorId: this.form.userId
+        investorAgentId: this.form.agentId
       }
     }
   },
@@ -460,8 +494,8 @@ export default {
       }
     },
     beforeOpenStore() {
-      if (this.form.userId == null) {
+      if (this.form.agentId == null) {
-        this.$message.warning(`请先选择${FieldName.INVESTOR}`);
+        this.$message.warning(`请先选择${FieldName.AGENT}`);
         return false;
       }
       return true;
@@ -644,6 +678,24 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
+    handleBindInvestor(row) {
+      this.row = row;
+      this.showCheckBindInvestor = true;
+    },
+    handleUnBindInvestor(row) {
+      this.$confirm(`确定解绑${row.deviceNo}的${FieldName.INVESTOR}吗？`, '解绑', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        unbindInvestor(row.deviceId).then(res => {
+          if (res.code === 200) {
+            this.$message.success("操作成功");
+            this.getList();
+          }
+        })
+      })
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/device/export', {

src/views/system/smUser/index.vue

@@ -338,6 +338,7 @@ export default {
         {key: 'deviceCount', visible: false, label: '设备数', align: 'center', minWidth: null, sortable: false, width: null},
         {key: 'billCount', visible: false, label: '订单数', align: 'center', minWidth: null, sortable: false, width: null},
         {key: 'billAmount', visible: false, label: '订单总额', align: 'center', minWidth: null, sortable: false, width: null},
+        {key: 'deptName', visible: false, label: '运营商', align: 'center', minWidth: null, sortable: false, width: null},
         {key: 'deviceAdmin', visible: false, label: '是否设备管理员', align: 'center', minWidth: null, sortable: false, width: null},
       ],
       openServiceRate: false,