周洋

src/api/admin/proxy.js

@@ -29,3 +29,8 @@ export function changeProxyStatus(proxyId, status) {
 export function allEnabledProxies() {
   return request({ url: '/admin/proxy/allEnabled', method: 'get' })
 }
+
+// 重置代理密码
+export function resetProxyPwd(proxyId, password) {
+  return request({ url: `/admin/proxy/resetPwd/${proxyId}`, method: 'put', data: { password } })
+}

src/api/admin/sysCompany.js

@@ -96,4 +96,13 @@ export function editTenantMenu(companyId, data) {
     method: 'post',
     data: data
   })
+}
+
+// 重置租户管理员密码
+export function resetTenantPwd(companyId, password) {
+  return request({
+    url: '/admin/company/' + companyId + '/resetPwd',
+    method: 'put',
+    data: { password }
+  })
 }

src/api/system/smsPort.js

@@ -38,6 +38,31 @@ export function delAssign(id) {
   return request({ url: '/admin/smsPort/assign/' + id, method: 'delete' })
 }
 
+// ========== 设备管理 ==========
+export function listDevice(query) {
+  return request({ url: '/admin/smsPort/device/list', method: 'get', params: query })
+}
+
+export function getDevice(deviceId) {
+  return request({ url: '/admin/smsPort/device/' + deviceId, method: 'get' })
+}
+
+export function addDevice(data) {
+  return request({ url: '/admin/smsPort/device', method: 'post', data })
+}
+
+export function updateDevice(data) {
+  return request({ url: '/admin/smsPort/device', method: 'put', data })
+}
+
+export function delDevice(deviceId) {
+  return request({ url: '/admin/smsPort/device/' + deviceId, method: 'delete' })
+}
+
+export function assignDevice(deviceId, companyUserId) {
+  return request({ url: '/admin/smsPort/device/assign', method: 'put', params: { deviceId, companyUserId } })
+}
+
 // ========== 手机卡管理 ==========
 export function listCard(query) {
   return request({ url: '/admin/smsPort/card/list', method: 'get', params: query })

src/utils/index.js

@@ -387,4 +387,32 @@ export function camelCase(str) {
 export function isNumberStr(str) {
   return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
 }
+
+/**
+ * 生成随机密码（包含大小写字母、数字、特殊字符）
+ * @param {number} length 密码长度，默认12
+ * @returns {string} 随机密码
+ */
+export function generateRandomPwd(length = 12) {
+  const upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+  const lower = 'abcdefghijklmnopqrstuvwxyz'
+  const numbers = '0123456789'
+  const specials = '!@#$%^&*'
+
+  // 确保每种类型至少一个
+  let pwd = ''
+  pwd += upper[Math.floor(Math.random() * upper.length)]
+  pwd += lower[Math.floor(Math.random() * lower.length)]
+  pwd += numbers[Math.floor(Math.random() * numbers.length)]
+  pwd += specials[Math.floor(Math.random() * specials.length)]
+
+  // 剩余位随机填充
+  const all = upper + lower + numbers + specials
+  for (let i = 4; i < length; i++) {
+    pwd += all[Math.floor(Math.random() * all.length)]
+  }
+
+  // 洗牌打乱顺序
+  return pwd.split('').sort(() => Math.random() - 0.5).join('')
+}
  

src/views/admin/proxy/index.vue

@@ -52,9 +52,10 @@
             @change="handleStatusChange(s.row)" v-hasPermi="['admin:proxy:edit']" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="160" fixed="right" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="200" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="s">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openProxyDialog(s.row)" v-hasPermi="['admin:proxy:edit']">编辑</el-button>
+          <el-button size="mini" type="text" icon="el-icon-key" style="color:#722ed1" @click="handleResetPwd(s.row)" v-hasPermi="['admin:proxy:edit']">重置密码</el-button>
           <el-button v-if="s.row.status === 1" size="mini" type="text" style="color:#fa8c16" @click="handleToggleStatus(s.row, 0)" v-hasPermi="['admin:proxy:edit']">禁用</el-button>
           <el-button v-else size="mini" type="text" style="color:#52c41a" @click="handleToggleStatus(s.row, 1)" v-hasPermi="['admin:proxy:edit']">启用</el-button>
           <el-button size="mini" type="text" style="color:#f5222d" icon="el-icon-delete" @click="handleDeleteProxy(s.row)" v-hasPermi="['admin:proxy:remove']">删除</el-button>
@@ -82,6 +83,11 @@
         <el-form-item label="公司名称" prop="companyName">
           <el-input v-model="proxyForm.companyName" placeholder="请输入公司名称" />
         </el-form-item>
+        <el-form-item v-if="!proxyForm.proxyId" label="登录密码" prop="password">
+          <el-input v-model="proxyForm.password" placeholder="请输入密码" show-password>
+            <el-button slot="append" icon="el-icon-refresh" @click="generatePwd" title="随机生成密码">生成</el-button>
+          </el-input>
+        </el-form-item>
         <el-form-item label="平台折扣(%)" prop="profitShareRatio">
           <el-input-number v-model="proxyForm.profitShareRatio" :min="0" :max="100" :precision="2" style="width:100%" />
         </el-form-item>
@@ -111,8 +117,9 @@
 
 <script>
 import {
-  listProxy, getProxy, addProxy, updateProxy, delProxy, changeProxyStatus
+  listProxy, getProxy, addProxy, updateProxy, delProxy, changeProxyStatus, resetProxyPwd
 } from '@/api/admin/proxy'
+import { generateRandomPwd } from '@/utils/index'
 
 export default {
   name: 'AdminProxy',
@@ -131,11 +138,14 @@ export default {
       proxyForm: {
         proxyId: null, proxyName: '',
         contactName: '', contactMobile: '', email: '', companyName: '',
+        password: '',
         profitShareRatio: 0, accountFee: 0, expireTime: null, status: 1, remark: ''
       },
       proxyRules: {
         proxyName: [{ required: true, message: '请输入代理名称', trigger: 'blur' }],
-        contactMobile: [{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确手机号', trigger: 'blur' }]
+        contactMobile: [{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确手机号', trigger: 'blur' }],
+        password: [{ required: true, message: '请输入密码', trigger: 'blur' },
+          { min: 6, message: '密码长度不能少于6位', trigger: 'blur' }]
       }
     }
   },
@@ -166,9 +176,32 @@ export default {
         })
       } else {
         this.proxyFormTitle = '新增代理'
+        this.proxyForm.password = generateRandomPwd(12)
         this.proxyDialogVisible = true
       }
     },
+    /** 随机生成密码 */
+    generatePwd() {
+      this.proxyForm.password = generateRandomPwd(12)
+    },
+    /** 重置代理密码 */
+    handleResetPwd(row) {
+      const newPwd = generateRandomPwd(12)
+      this.$prompt('为代理 "' + row.proxyName + '" 重置密码', '重置密码', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: newPwd,
+        inputPattern: /^.{6,30}$/,
+        inputErrorMessage: '密码长度必须介于 6 和 30 之间',
+        inputType: 'text'
+      }).then(({ value }) => {
+        resetProxyPwd(row.proxyId, value).then(() => {
+          this.$modal.msgSuccess('密码重置成功，新密码为：' + value)
+        }).catch(() => {
+          this.$message.error('密码重置失败')
+        })
+      }).catch(() => {})
+    },
     submitProxyForm() {
       this.$refs['proxyForm'].validate(valid => {
         if (!valid) return
@@ -203,6 +236,7 @@ export default {
       this.proxyForm = {
         proxyId: null, proxyName: '',
         contactName: '', contactMobile: '', email: '', companyName: '',
+        password: '',
         profitShareRatio: 0, accountFee: 0, expireTime: null, status: 1, remark: ''
       }
       if (this.$refs['proxyForm']) this.$refs['proxyForm'].resetFields()

src/views/admin/smsApi/index.vue

@@ -11,8 +11,8 @@
       </el-form-item>
       <el-form-item label="服务商" prop="provider">
         <el-select v-model="queryParams.provider" placeholder="请选择" clearable>
-          <el-option label="润方" value="rf" />
-          <el-option label="德华" value="dh" />
+          <el-option label="迈远" value="rf" />
+           
           <el-option label="手机卡" value="card" />
         </el-select>
       </el-form-item>
@@ -104,7 +104,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="接口名称" prop="apiName">
-              <el-input v-model="form.apiName" placeholder="如：润方行业验证码通知" />
+              <el-input v-model="form.apiName" placeholder="如：迈远行业验证码通知" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -119,8 +119,8 @@
           <el-col :span="12">
             <el-form-item label="服务商" prop="provider">
               <el-select v-model="form.provider" placeholder="请选择" style="width:100%">
-                <el-option label="润方" value="rf" />
-                <el-option label="德华" value="dh" />
+                <el-option label="迈远" value="rf" />
+                 
                 <el-option label="手机卡" value="card" />
               </el-select>
             </el-form-item>
@@ -152,14 +152,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.provider === 'rf'" label="接口地址">
-              <el-input v-model="form.url" placeholder="润方专用" />
+              <el-input v-model="form.url" placeholder="迈远专用" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="form.provider === 'rf'" :gutter="20">
           <el-col :span="12">
             <el-form-item label="扩展码">
-              <el-input v-model="form.code" placeholder="润方专用(旧,端口优先)" />
+              <el-input v-model="form.code" placeholder="迈远专用(旧,端口优先)" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -193,7 +193,7 @@
     <el-dialog :title="portDialogTitle" :visible.sync="portDialogVisible" width="560px" append-to-body>
       <el-form ref="portForm" :model="portForm" :rules="portRules" label-width="100px" size="small">
         <el-form-item label="端口名称" prop="portName">
-          <el-input v-model="portForm.portName" placeholder="如：润方端口1 / XX医院卡" />
+          <el-input v-model="portForm.portName" placeholder="如：迈远端口1 / XX医院卡" />
         </el-form-item>
         <el-form-item label="端口号" prop="portNo">
           <el-input v-model="portForm.portNo" :placeholder="currentApiProvider === 'card' ? '手机号' : 'extno扩展码'" />
@@ -284,7 +284,7 @@ export default {
       return map[type] || '未知'
     },
     providerFormat(p) {
-      const map = { rf: '润方', dh: '德华', card: '手机卡' }
+      const map = { rf: '迈远',    card: '手机卡' }
       return map[p] || p
     },
     getList() {

src/views/admin/smsApiTenant/index.vue

@@ -190,7 +190,7 @@ export default {
       return map[type] || '未知'
     },
     providerFormat(p) {
-      const map = { rf: '润方', dh: '德华', card: '手机卡' }
+      const map = { rf: '迈远',    card: '手机卡' }
       return map[p] || p
     },
     calcProfit(row) {

src/views/admin/smsCard/index.vue

@@ -6,6 +6,9 @@
           <el-option v-for="c in companyList" :key="c.companyId" :label="c.companyName" :value="c.companyId" />
         </el-select>
       </el-form-item>
+      <el-form-item label="IMEI" prop="imei">
+        <el-input v-model="queryParams.imei" placeholder="IMEI号" clearable style="width:160px" />
+      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择" clearable>
           <el-option label="在线" :value="1" />
@@ -28,7 +31,17 @@
     <el-table v-loading="loading" :data="cardList" border size="small">
       <el-table-column label="ID" align="center" prop="cardId" width="60" />
       <el-table-column label="IMEI" align="center" prop="imei" width="150" />
-      <el-table-column label="设备名称" align="center" prop="deviceName" min-width="100" />
+      <el-table-column label="所属设备" align="center" min-width="120" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span v-if="scope.row.deviceId">{{ scope.row.deviceName || '设备#' + scope.row.deviceId }}</span>
+          <el-tag v-else type="info" size="mini">未关联</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="卡槽" align="center" width="60">
+        <template slot-scope="scope">
+          <span>{{ scope.row.slotIndex || 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="租户" align="center" prop="tenantName" min-width="120" show-overflow-tooltip />
       <el-table-column label="卡槽1手机号" align="center" prop="phone1" width="130" />
       <el-table-column label="卡槽2手机号" align="center" prop="phone2" width="130" />
@@ -76,7 +89,7 @@
     <!-- 新增/修改弹窗 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="small">
-        <el-row :gutter="20">
+       <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="IMEI" prop="imei">
               <el-input v-model="form.imei" placeholder="手机IMEI号" />
@@ -96,6 +109,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="关联设备">
+              <el-select v-model="form.deviceId" placeholder="选择设备" clearable filterable style="width:100%">
+                <el-option v-for="d in deviceList" :key="d.deviceId" :label="d.deviceName + ' (' + d.imei + ')'" :value="d.deviceId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="卡槽位置">
+              <el-select v-model="form.slotIndex" style="width:100%">
+                <el-option :value="1" label="卡槽1" />
+                <el-option :value="2" label="卡槽2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="关联端口">
               <el-input v-model="form.portId" placeholder="端口ID(可选)" />
@@ -274,7 +304,7 @@
 </template>
 
 <script>
-import { listCard, addCard, updateCard, delCard, listMiddleware, addMiddleware, updateMiddleware, delMiddleware } from '@/api/system/smsPort'
+import { listCard, addCard, updateCard, delCard, listMiddleware, addMiddleware, updateMiddleware, delMiddleware, listDevice } from '@/api/system/smsPort'
 import { listSmsApi } from '@/api/system/smsApi'
 import { listAllCompanies } from '@/api/admin/sysCompany'
 
@@ -285,6 +315,7 @@ export default {
       loading: false,
       mwLoading: false,
       cardList: [],
+      deviceList: [],
       mwList: [],
       companyList: [],
       cardApiList: [],
@@ -292,7 +323,7 @@ export default {
       dialogTitle: '',
       mwDialogVisible: false,
       mwDialogTitle: '',
-      queryParams: { tenantId: undefined, status: undefined },
+      queryParams: { tenantId: undefined, imei: undefined, status: undefined },
       form: {},
       rules: {
         imei: [{ required: true, message: 'IMEI不能为空', trigger: 'blur' }],
@@ -309,6 +340,7 @@ export default {
   created() {
     this.getList()
     this.loadMwList()
+    this.loadDeviceList()
     this.loadCompanyList()
     this.loadCardApiList()
   },
@@ -325,6 +357,11 @@ export default {
         this.mwList = res.data || []
       }).finally(() => { this.mwLoading = false })
     },
+    loadDeviceList() {
+      listDevice({}).then(res => {
+        this.deviceList = res.data || []
+      })
+    },
     loadCompanyList() {
       listAllCompanies({ pageNum: 1, pageSize: 1000 }).then(res => {
         this.companyList = res.rows || res.data || []
@@ -337,12 +374,12 @@ export default {
     },
     handleQuery() { this.getList() },
     resetQuery() {
-      this.queryParams = { tenantId: undefined, status: undefined }
+      this.queryParams = { tenantId: undefined, imei: undefined, status: undefined }
       this.handleQuery()
     },
     resetForm() {
       this.form = {
-        cardId: undefined, imei: '', deviceName: '', tenantId: undefined, portId: undefined,
+        cardId: undefined, imei: '', deviceName: '', tenantId: undefined, deviceId: undefined, slotIndex: 1, portId: undefined,
         phone1: '', phone2: '', simCount: 1, status: 0,
         smsHourlyLimit: 100, smsDailyLimit: 500, smsBalance: 0,
         smsSentToday: 0, smsSentHour: 0,

src/views/admin/smsDevice/index.vue

@@ -0,0 +1,274 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" size="small">
+      <el-form-item label="租户" prop="tenantId">
+        <el-select v-model="queryParams.tenantId" placeholder="选择租户" clearable filterable>
+          <el-option v-for="c in companyList" :key="c.companyId" :label="c.companyName" :value="c.companyId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="IMEI" prop="imei">
+        <el-input v-model="queryParams.imei" placeholder="IMEI号" clearable style="width:160px" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable>
+          <el-option label="在线" :value="1" />
+          <el-option label="离线" :value="0" />
+          <el-option label="禁用" :value="2" />
+        </el-select>
+      </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">新增设备</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceList" border size="small">
+      <el-table-column label="ID" align="center" prop="deviceId" width="60" />
+      <el-table-column label="IMEI" align="center" prop="imei" width="150" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" min-width="120" show-overflow-tooltip />
+      <el-table-column label="租户" align="center" prop="tenantName" min-width="120" show-overflow-tooltip />
+      <el-table-column label="绑定销售" align="center" prop="userName" min-width="100" show-overflow-tooltip />
+      <el-table-column label="关联中间件" align="center" prop="middlewareName" min-width="120" show-overflow-tooltip />
+      <el-table-column label="卡数量" align="center" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.cardCount || 0 }} 张</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="在线卡" align="center" width="80">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.onlineCardCount > 0" type="success" size="mini">{{ scope.row.onlineCardCount }}</el-tag>
+          <el-tag v-else type="info" size="mini">0</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="APP版本" align="center" prop="appVersion" width="90" />
+      <el-table-column label="状态" align="center" prop="status" width="70">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.status === 1 ? 'success' : scope.row.status === 0 ? 'danger' : 'info'" size="small">
+            {{ scope.row.status === 1 ? '在线' : scope.row.status === 0 ? '离线' : '禁用' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="最后心跳" align="center" prop="lastHeartbeat" width="160" />
+      <el-table-column label="操作" align="center" width="200" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handleUpdate(scope.row)">编辑</el-button>
+          <el-button size="mini" type="text" @click="handleAssign(scope.row)">分配销售</el-button>
+          <el-button size="mini" type="text" style="color:#f56c6c" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 新增/修改弹窗 -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="560px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" size="small">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="IMEI" prop="imei">
+              <el-input v-model="form.imei" placeholder="手机IMEI号" :disabled="!!form.deviceId" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input v-model="form.deviceName" placeholder="如：红米Note12" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所属租户" prop="tenantId">
+              <el-select v-model="form.tenantId" placeholder="选择租户" filterable style="width:100%">
+                <el-option v-for="c in companyList" :key="c.companyId" :label="c.companyName" :value="c.companyId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="关联中间件">
+              <el-select v-model="form.middlewareId" placeholder="选择中间件" clearable filterable style="width:100%">
+                <el-option v-for="mw in mwList" :key="mw.id" :label="mw.middlewareName" :value="mw.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="绑定销售">
+              <el-select v-model="form.companyUserId" placeholder="选择销售" clearable filterable style="width:100%">
+                <el-option v-for="u in userList" :key="u.userId" :label="u.userName" :value="u.userId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-select v-model="form.status" style="width:100%">
+                <el-option :value="0" label="离线" />
+                <el-option :value="1" label="在线" />
+                <el-option :value="2" label="禁用" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" :rows="2" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 分配销售弹窗 -->
+    <el-dialog title="分配销售" :visible.sync="assignVisible" width="420px" append-to-body>
+      <el-form label-width="80px" size="small">
+        <el-form-item label="设备">
+          <el-input :value="assignRow.deviceName + ' (' + assignRow.imei + ')'" disabled />
+        </el-form-item>
+        <el-form-item label="选择销售">
+          <el-select v-model="assignUserId" placeholder="选择销售用户" filterable style="width:100%">
+            <el-option v-for="u in userList" :key="u.userId" :label="u.userName" :value="u.userId" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary" @click="submitAssign">确 定</el-button>
+        <el-button @click="assignVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDevice, addDevice, updateDevice, delDevice, assignDevice, listMiddleware } from '@/api/system/smsPort'
+import { listAllCompanies } from '@/api/admin/sysCompany'
+
+export default {
+  name: 'AdminSmsDevice',
+  data() {
+    return {
+      loading: false,
+      deviceList: [],
+      companyList: [],
+      mwList: [],
+      userList: [],
+      dialogVisible: false,
+      dialogTitle: '',
+      assignVisible: false,
+      assignRow: {},
+      assignUserId: undefined,
+      queryParams: { tenantId: undefined, imei: undefined, status: undefined },
+      form: {},
+      rules: {
+        imei: [{ required: true, message: 'IMEI不能为空', trigger: 'blur' }],
+        tenantId: [{ required: true, message: '请选择租户', trigger: 'change' }]
+      }
+    }
+  },
+  created() {
+    this.getList()
+    this.loadCompanyList()
+    this.loadMwList()
+    this.loadUserList()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      listDevice(this.queryParams).then(res => {
+        this.deviceList = res.data || []
+      }).finally(() => { this.loading = false })
+    },
+    loadCompanyList() {
+      listAllCompanies({ pageNum: 1, pageSize: 1000 }).then(res => {
+        this.companyList = res.rows || res.data || []
+      })
+    },
+    loadMwList() {
+      listMiddleware({ status: 1 }).then(res => {
+        this.mwList = res.data || []
+      })
+    },
+    loadUserList() {
+      // 查询租户下的销售用户（简化：查全部用户，后续可按租户过滤）
+      import('@/api/system/user').then(mod => {
+        if (mod.listUser) {
+          mod.listUser({ pageNum: 1, pageSize: 5000 }).then(res => {
+            this.userList = res.rows || []
+          })
+        }
+      }).catch(() => {
+        // 降级: 从公司列表中获取
+        this.userList = []
+      })
+    },
+    handleQuery() { this.getList() },
+    resetQuery() {
+      this.queryParams = { tenantId: undefined, imei: undefined, status: undefined }
+      this.handleQuery()
+    },
+    resetForm() {
+      this.form = {
+        deviceId: undefined, imei: '', deviceName: '', tenantId: undefined,
+        companyUserId: undefined, middlewareId: undefined, status: 0, remark: ''
+      }
+    },
+    handleAdd() {
+      this.resetForm()
+      this.dialogTitle = '新增设备'
+      this.dialogVisible = true
+    },
+    handleUpdate(row) {
+      this.resetForm()
+      this.form = { ...row }
+      this.dialogTitle = '修改设备'
+      this.dialogVisible = true
+    },
+    submitForm() {
+      this.$refs.form.validate(valid => {
+        if (!valid) return
+        if (this.form.deviceId) {
+          updateDevice(this.form).then(() => {
+            this.$message.success('修改成功')
+            this.dialogVisible = false
+            this.getList()
+          })
+        } else {
+          addDevice(this.form).then(() => {
+            this.$message.success('新增成功')
+            this.dialogVisible = false
+            this.getList()
+          })
+        }
+      })
+    },
+    handleDelete(row) {
+      this.$confirm('确认删除此设备？关联的手机卡不会被删除。', '提示', { type: 'warning' }).then(() => {
+        delDevice(row.deviceId).then(() => { this.$message.success('删除成功'); this.getList() })
+      }).catch(() => {})
+    },
+    handleAssign(row) {
+      this.assignRow = row
+      this.assignUserId = row.companyUserId
+      this.assignVisible = true
+    },
+    submitAssign() {
+      if (!this.assignUserId) {
+        this.$message.warning('请选择销售用户')
+        return
+      }
+      assignDevice(this.assignRow.deviceId, this.assignUserId).then(() => {
+        this.$message.success('分配成功')
+        this.assignVisible = false
+        this.getList()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/views/admin/sysCompany/index.vue

@@ -58,9 +58,10 @@
           <el-tag v-else type="danger" size="mini">禁用</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="340" fixed="right" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="380" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleView(scope.row)">编辑</el-button>
+          <el-button size="mini" type="text" icon="el-icon-key" style="color:#722ed1" @click="handleResetPwd(scope.row)">重置密码</el-button>
           <el-button size="mini" type="text" style="color:#52c41a" icon="el-icon-coin" @click="handleRecharge(scope.row)">充值/扣款</el-button>
           <el-button size="mini" type="text" style="color:#722ed1" icon="el-icon-menu" @click="handleEditMenu(scope.row, 'sys')">管理端菜单</el-button>
           <el-button size="mini" type="text" style="color:#13c2c2" icon="el-icon-sell" @click="handleEditMenu(scope.row, 'com')">销售菜单</el-button>
@@ -169,7 +170,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="密码" prop="password">
-              <el-input v-model="addDialog.form.password" type="password" show-password placeholder="请输入密码" />
+              <el-input v-model="addDialog.form.password" type="password" show-password placeholder="请输入密码">
+                <el-button slot="append" icon="el-icon-refresh" @click="generateAddPwd" title="随机生成密码">生成</el-button>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -256,7 +259,8 @@
 </template>
 
 <script>
-import { listAllCompanies, getCompanyInfo, addCompany, updateTenant, disableCompany, enableCompany, rechargeCompany, exportCompany, getTenantMenuTree, editTenantMenu } from '@/api/admin/sysCompany'
+import { listAllCompanies, getCompanyInfo, addCompany, updateTenant, disableCompany, enableCompany, rechargeCompany, exportCompany, getTenantMenuTree, editTenantMenu, resetTenantPwd } from '@/api/admin/sysCompany'
+import { generateRandomPwd } from '@/utils/index'
 
 export default {
   name: 'SysCompanyAdmin',
@@ -357,7 +361,7 @@ export default {
         contactPhone: '',
         contactName: '',
         userName: '',
-        password: '',
+        password: generateRandomPwd(12),
         manager: '',
         startTime: null,
         expireTime: null,
@@ -368,6 +372,28 @@ export default {
         if (this.$refs.addForm) this.$refs.addForm.clearValidate()
       })
     },
+    /** 随机生成新增密码 */
+    generateAddPwd() {
+      this.addDialog.form.password = generateRandomPwd(12)
+    },
+    /** 重置租户管理员密码 */
+    handleResetPwd(row) {
+      const newPwd = generateRandomPwd(12)
+      this.$prompt('为租户 "' + row.tenantName + '" 重置管理员密码', '重置密码', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: newPwd,
+        inputPattern: /^.{6,30}$/,
+        inputErrorMessage: '密码长度必须介于 6 和 30 之间',
+        inputType: 'text'
+      }).then(({ value }) => {
+        resetTenantPwd(row.id, value).then(() => {
+          this.$modal.msgSuccess('密码重置成功，新密码为：' + value)
+        }).catch(() => {
+          this.$message.error('密码重置失败')
+        })
+      }).catch(() => {})
+    },
     /** 提交新增租户 */
     submitAdd() {
       this.$refs['addForm'].validate(valid => {