fix: 修改新增用户商品的配置项逻辑

src/components/admin/PermissionPathSelector.vue

@@ -142,7 +142,7 @@ const searchParams = reactive({
   key: '',
   method: '',
   page: 1,
-  count: 20
+  count: 10
 })
 
 // 状态

src/components/admin/PlanSelector.vue

@@ -2,9 +2,10 @@
   <el-dialog v-model="visible" title="选择套餐" width="700px" append-to-body @close="handleClose">
     <div class="selector-toolbar">
       <el-button :icon="Refresh" @click="loadList" :loading="loading">刷新</el-button>
+      <el-button type="primary" :icon="Plus" @click="showCreate = true">新建套餐</el-button>
       <span style="color:#909399;font-size:13px" v-if="goodId">商品 ID: {{ goodId }}</span>
     </div>
-    <el-table :data="list" v-loading="loading" highlight-current-row @current-change="row => selected = row" :height="360" stripe size="small">
+    <el-table :data="list" v-loading="loading" highlight-current-row @current-change="row => selected = row" :height="300" stripe size="small">
       <el-table-column prop="id" label="ID" width="80" />
       <el-table-column prop="name" label="套餐名称" min-width="160" show-overflow-tooltip />
       <el-table-column prop="note" label="说明" min-width="160" show-overflow-tooltip>
@@ -28,12 +29,59 @@
       <el-button type="primary" :disabled="!selected" @click="handleConfirm">确定选择</el-button>
     </template>
   </el-dialog>
+
+  <!-- 新建套餐弹窗 -->
+  <el-dialog v-model="showCreate" title="新建套餐" width="680px" append-to-body destroy-on-close class="scrollable-dialog">
+    <el-form :model="createForm" label-width="90px">
+      <el-form-item label="套餐名称" required><el-input v-model="createForm.name" placeholder="请输入套餐名称" /></el-form-item>
+      <el-form-item label="说明"><el-input v-model="createForm.note" type="textarea" :rows="2" placeholder="请输入套餐说明" /></el-form-item>
+      <el-form-item label="参数配置">
+        <div style="width:100%">
+          <div v-if="!goodId" style="color:#c0c4cc;font-size:13px">请先选择商品</div>
+          <div v-else-if="createSpecLoading" style="color:#909399;font-size:13px">加载参数中...</div>
+          <div v-else-if="createSpecList.length === 0" style="color:#909399;font-size:13px">该商品暂无参数</div>
+          <div v-else>
+            <div v-for="spec in createSpecList" :key="spec.id" style="margin-bottom:14px;padding-bottom:14px;border-bottom:1px solid #f5f5f5">
+              <div style="font-size:13px;font-weight:500;color:#303133;margin-bottom:6px">
+                {{ spec.name }}
+                <el-tag v-if="spec.must" size="small" type="danger" style="margin-left:4px">必填</el-tag>
+              </div>
+              <template v-if="spec.type === 'select' && spec.attrs && spec.attrs.length > 0">
+                <el-radio-group v-model="createSpecValues[spec.id]" size="small" @change="buildCreateArgsJson">
+                  <el-radio-button v-for="attr in spec.attrs" :key="attr.id" :value="attr.id">{{ attr.name }}</el-radio-button>
+                </el-radio-group>
+              </template>
+              <template v-else-if="spec.type === 'number'">
+                <div style="display:flex;align-items:center;gap:10px">
+                  <el-input-number v-model="createSpecValues[spec.id]" :min="spec.min || 0" :max="spec.max || 9999" :step="spec.step || 1" :step-strictly="true" size="small" @change="buildCreateArgsJson" style="width:180px" />
+                  <span style="font-size:12px;color:#909399">范围: {{ spec.min || 0 }} ~ {{ spec.max || 9999 }}，步长: {{ spec.step || 1 }}</span>
+                </div>
+              </template>
+              <template v-else>
+                <el-input v-model="createSpecValues[spec.id]" placeholder="请输入值" size="small" style="width:200px" @input="buildCreateArgsJson" />
+              </template>
+            </div>
+            <div v-if="createForm.args" style="margin-top:8px">
+              <div style="font-size:12px;color:#909399;margin-bottom:4px">参数 JSON：</div>
+              <el-input v-model="createForm.args" type="textarea" :rows="3" readonly style="font-family:monospace;font-size:12px" />
+            </div>
+          </div>
+        </div>
+      </el-form-item>
+      <el-form-item label="排序"><el-input-number v-model="createForm.index" :min="0" controls-position="right" style="width:120px" /></el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="showCreate = false">取消</el-button>
+      <el-button type="primary" :loading="createLoading" @click="submitCreate">创建</el-button>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup>
-import { ref, watch } from 'vue'
-import { Refresh } from '@element-plus/icons-vue'
-import { getProductPlanList } from '@/api/admin/product'
+import { ref, reactive, watch } from 'vue'
+import { Refresh, Plus } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
+import { getProductPlanList, createProductPlan, getProductParameterList } from '@/api/admin/product'
 
 const props = defineProps({
   modelValue: { type: Boolean, default: false },
@@ -48,6 +96,46 @@ const total = ref(0)
 const page = ref(1)
 const pageSize = ref(10)
 const selected = ref(null)
+const showCreate = ref(false)
+const createLoading = ref(false)
+const createForm = reactive({ name: '', note: '', index: 0, args: '' })
+const createSpecList = ref([])
+const createSpecLoading = ref(false)
+const createSpecValues = reactive({})
+
+watch(showCreate, (v) => {
+  if (v && props.goodId) loadCreateSpec()
+})
+
+const loadCreateSpec = async () => {
+  createSpecLoading.value = true
+  try {
+    const res = await getProductParameterList({ good_id: props.goodId })
+    if (res?.data?.code === 200) {
+      createSpecList.value = res.data.data || []
+      for (const spec of createSpecList.value) {
+        if (spec.type === 'number' && createSpecValues[spec.id] === undefined) createSpecValues[spec.id] = spec.min || 0
+      }
+    }
+  } catch { createSpecList.value = [] } finally { createSpecLoading.value = false }
+}
+
+const buildCreateArgsJson = () => {
+  const result = []
+  for (const spec of createSpecList.value) {
+    const val = createSpecValues[spec.id]
+    if (val === undefined || val === null || val === '') continue
+    if (spec.type === 'select') {
+      const attr = spec.attrs?.find(a => a.id === val)
+      if (attr) result.push({ arg_id: spec.id, name: spec.name, attr_id: attr.id, value: attr.value, number: 0 })
+    } else if (spec.type === 'number') {
+      result.push({ arg_id: spec.id, name: spec.name, attr_id: 0, value: '', number: val })
+    } else {
+      result.push({ arg_id: spec.id, name: spec.name, attr_id: 0, value: String(val), number: 0 })
+    }
+  }
+  createForm.args = result.length > 0 ? JSON.stringify(result) : ''
+}
 
 watch(() => props.modelValue, (v) => { visible.value = v; if (v) { selected.value = null; loadList() } })
 watch(visible, (v) => emit('update:modelValue', v))
@@ -66,6 +154,28 @@ const loadList = async () => {
   } catch { /* */ } finally { loading.value = false }
 }
 
+const submitCreate = async () => {
+  if (!createForm.name) { ElMessage.warning('请输入套餐名称'); return }
+  if (!props.goodId) { ElMessage.warning('请先选择商品'); return }
+  createLoading.value = true
+  try {
+    const fd = new FormData()
+    fd.append('good_id', props.goodId)
+    fd.append('name', createForm.name)
+    if (createForm.note) fd.append('note', createForm.note)
+    fd.append('index', createForm.index)
+    if (createForm.args) fd.append('args', createForm.args)
+    const res = await createProductPlan(fd)
+    if (res?.data?.code === 200) {
+      ElMessage.success('创建成功')
+      showCreate.value = false
+      Object.assign(createForm, { name: '', note: '', index: 0, args: '' })
+      for (const k in createSpecValues) delete createSpecValues[k]
+      loadList()
+    } else ElMessage.error(res?.data?.message || '创建失败')
+  } catch { ElMessage.error('创建失败') } finally { createLoading.value = false }
+}
+
 const handleClose = () => { visible.value = false }
 const handleConfirm = () => { if (selected.value) { emit('confirm', selected.value); handleClose() } }
 </script>

src/components/admin/UserVmVolumeSelector.vue

@@ -0,0 +1,131 @@
+<template>
+  <el-dialog v-model="visible" title="选择数据卷进行挂载" width="680px" append-to-body @close="handleClose">
+    <div class="selector-toolbar">
+      <el-input v-model="keyword" placeholder="搜索数据卷名称" clearable style="width:200px"
+        @keyup.enter="loadList" @clear="loadList">
+        <template #prefix><el-icon><Search /></el-icon></template>
+      </el-input>
+      <el-button :icon="Refresh" @click="loadList" :loading="loading">刷新</el-button>
+      <el-button type="primary" :icon="Plus" @click="showCreate = true">新建数据卷</el-button>
+    </div>
+    <el-table :data="list" v-loading="loading" highlight-current-row
+      @current-change="row => selected = row" :height="280" stripe size="small">
+      <el-table-column prop="id" label="ID" width="70" />
+      <el-table-column prop="name" label="名称" min-width="160" show-overflow-tooltip />
+      <el-table-column label="大小" width="80">
+        <template #default="{ row }">{{ row.size }} GB</template>
+      </el-table-column>
+      <el-table-column label="类型" width="80">
+        <template #default="{ row }">
+          <el-tag :type="row.is_system ? 'danger' : ''" size="small">{{ row.is_system ? '系统盘' : '数据盘' }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" width="80">
+        <template #default="{ row }">
+          <el-tag :type="row.status === 'ready' ? 'success' : 'info'" size="small">{{ row.status || '-' }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="挂载" width="80">
+        <template #default="{ row }">
+          <el-tag :type="row.is_mount ? 'success' : 'info'" size="small">{{ row.is_mount ? '已挂载' : '未挂载' }}</el-tag>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-empty v-if="!list.length && !loading" :image-size="60" description="暂无数据卷" />
+    <div class="selector-footer-bar">
+      <span v-if="selected" style="color:#606266;font-size:13px">已选：{{ selected.name }} (ID: {{ selected.id }})</span>
+      <el-pagination v-model:current-page="page" v-model:page-size="pageSize" :page-sizes="[10,20]" :total="total"
+        layout="total,sizes,prev,pager,next" small background
+        @size-change="s => { pageSize = s; page = 1; loadList() }"
+        @current-change="p => { page = p; loadList() }" />
+    </div>
+    <template #footer>
+      <el-button @click="handleClose">取消</el-button>
+      <el-button type="primary" :disabled="!selected || !!selected.is_mount" @click="handleConfirm">
+        {{ selected?.is_mount ? '已挂载' : '确定挂载' }}
+      </el-button>
+    </template>
+  </el-dialog>
+
+  <!-- 新建数据卷弹窗 -->
+  <el-dialog v-model="showCreate" title="新建数据卷" width="440px" append-to-body destroy-on-close>
+    <el-form :model="createForm" label-width="100px">
+      <el-form-item label="名称" required><el-input v-model="createForm.name" placeholder="数据卷名称" /></el-form-item>
+      <el-form-item label="大小(GB)"><el-input-number v-model="createForm.size" :min="1" controls-position="right" style="width:100%" /></el-form-item>
+      <el-form-item label="目标设备名"><el-input v-model="createForm.target_device" placeholder="不填自动生成" /></el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="showCreate = false">取消</el-button>
+      <el-button type="primary" :loading="createLoading" @click="submitCreate">创建</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive, watch } from 'vue'
+import { Search, Refresh, Plus } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
+import { getUserVmVolumeList, createUserVmVolume } from '@/api/admin/userVm'
+
+const props = defineProps({
+  modelValue: { type: Boolean, default: false },
+  userGoodsId: { type: Number, default: 0 }
+})
+const emit = defineEmits(['update:modelValue', 'confirm'])
+
+const visible = ref(false)
+const loading = ref(false)
+const list = ref([])
+const total = ref(0)
+const page = ref(1)
+const pageSize = ref(10)
+const keyword = ref('')
+const selected = ref(null)
+
+const showCreate = ref(false)
+const createLoading = ref(false)
+const createForm = reactive({ name: '', size: 10, target_device: '' })
+
+watch(() => props.modelValue, (v) => { visible.value = v; if (v) { selected.value = null; loadList() } })
+watch(visible, (v) => emit('update:modelValue', v))
+
+const loadList = async () => {
+  if (!props.userGoodsId) return
+  loading.value = true
+  try {
+    const res = await getUserVmVolumeList({ user_goods_id: props.userGoodsId, page: page.value, count: pageSize.value })
+    if (res?.data?.code === 200 && res?.data?.data) {
+      const d = res.data.data
+      list.value = d.data || (Array.isArray(d) ? d : [])
+      total.value = d.all_count ?? d.total ?? list.value.length
+    }
+  } catch { /* */ } finally { loading.value = false }
+}
+
+const submitCreate = async () => {
+  if (!createForm.name) { ElMessage.warning('请输入名称'); return }
+  createLoading.value = true
+  try {
+    const res = await createUserVmVolume({ user_goods_id: props.userGoodsId, ...createForm })
+    if (res?.data?.code === 200) {
+      ElMessage.success('创建成功')
+      showCreate.value = false
+      Object.assign(createForm, { name: '', size: 10, target_device: '' })
+      loadList()
+    } else ElMessage.error(res?.data?.message || '创建失败')
+  } catch { ElMessage.error('创建失败') } finally { createLoading.value = false }
+}
+
+const handleClose = () => { visible.value = false }
+const handleConfirm = () => {
+  if (selected.value && !selected.value.is_mount) {
+    emit('confirm', selected.value)
+    handleClose()
+  }
+}
+</script>
+
+<style scoped>
+.selector-toolbar { display: flex; gap: 8px; margin-bottom: 12px; align-items: center; }
+.selector-footer-bar { display: flex; justify-content: space-between; align-items: center; margin-top: 12px; }
+</style>

src/components/admin/VmSelectorPopup.vue

@@ -71,7 +71,7 @@ const loadList = async () => {
   if (!hostIdFilter.value) return
   loading.value = true
   try {
-    const res = await getVmList({ service_id: props.serviceId, host_id: hostIdFilter.value, page: 1, count: 100 })
+    const res = await getVmList({ service_id: props.serviceId, host_id: hostIdFilter.value, page: 1, count: 10 })
     const body = res?.data
     if (body?.code === 200 && body?.data) {
       const inner = body.data