fix(purchase): 审批人下拉隐藏角色/物料搜索下拉/价格弹窗确认/图片必填校验

inventory-backend/app/models/__init__.py

@@ -17,3 +17,9 @@ try:
     from app.models.outbound import TransOutbound, OutboundApproval
 except ImportError:
     pass
+
+# 5. 采购申请
+try:
+    from app.models.purchase import PurchaseRequest
+except ImportError:
+    pass

inventory-web/src/views/outbound/Selection.vue

@@ -335,7 +335,7 @@
             <el-option
                 v-for="user in approvers"
                 :key="user.id"
-                :label="`${user.username} (${user.role === 'SUPER_ADMIN' ? '超级管理员' : '主管'})`"
+                :label="`${user.username}`"
                 :value="user.id"
             />
           </el-select>

inventory-web/src/views/purchase/index.vue

@@ -12,7 +12,7 @@
         <el-radio-button :label="3">已完成</el-radio-button>
       </el-radio-group>
       <el-button type="primary" :icon="Refresh" @click="fetchData">刷新</el-button>
-      <el-button v-if="userStore.hasPermission('purchase_manage:operation')" type="success" :icon="Plus" @click="openCreateDialog">
+      <el-button type="success" :icon="Plus" @click="openCreateDialog">
         新建采购申请
       </el-button>
     </div>
@@ -70,13 +70,38 @@
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="采购物品" required>
-              <el-input v-model="form.name" placeholder="输入物品名称，可自动补全规格" clearable @blur="onNameBlur" @change="onNameChange" />
+              <el-select
+                  v-model="materialBaseId"
+                  filterable
+                  remote
+                  reserve-keyword
+                  clearable
+                  placeholder="输入名称或规格搜索..."
+                  :remote-method="handleSearchMaterialDebounced"
+                  :loading="searchLoading"
+                  style="width: 100%"
+                  @change="onMaterialSelected"
+                  default-first-option
+                  popper-class="long-dropdown"
+              >
+                <el-option
+                    v-for="item in materialOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                >
+                  <div style="display: flex; justify-content: space-between; align-items: center;">
+                    <span>{{ item.name }}</span>
+                    <span style="color: #999; font-size: 12px;">{{ item.spec_model || '-' }}</span>
+                  </div>
+                </el-option>
+              </el-select>
               <div v-if="autoFillHint" style="font-size: 12px; color: #67C23A; margin-top: 4px;">{{ autoFillHint }}</div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="规格型号">
-              <el-input v-model="form.spec_model" placeholder="可自动补全" clearable />
+              <el-input v-model="form.spec_model" placeholder="从物料列表选择后自动填充" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -92,7 +117,7 @@
           <el-col :span="12">
             <el-form-item label="审批人" required>
               <el-select v-model="form.approver_id" placeholder="请选择审批人" style="width: 100%;" filterable>
-                <el-option v-for="u in approvers" :key="u.id" :label="`${u.username} (${u.role === 'SUPER_ADMIN' ? '超级管理员' : '主管'})`" :value="u.id" />
+                <el-option v-for="u in approvers" :key="u.id" :label="u.username" :value="u.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -208,6 +233,7 @@ import { ref, computed, onMounted } from 'vue'
 import { Refresh, Plus } from '@element-plus/icons-vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useUserStore } from '@/stores/user'
+import { searchMaterialBase } from '@/api/inbound/buy'
 import {
   getPurchaseList, createPurchase, getPurchaseDetail,
   approvePurchase, getPurchaseApprovers, autoFillPurchase
@@ -247,6 +273,11 @@ const autoFillHint = ref('')
 // 审批人
 const approvers = ref<any[]>([])
 
+// 物料搜索
+const materialOptions = ref<any[]>([])
+const searchLoading = ref(false)
+const materialBaseId = ref<number | null>(null)
+
 // 表单
 const form = ref({
   name: '',
@@ -327,50 +358,82 @@ const openCreateDialog = () => {
     unit_price: undefined, total_price: undefined,
     approver_id: undefined, images: []
   }
-  fileList.value = []
+  materialBaseId.value = null
+  materialOptions.value = []
   autoFillHint.value = ''
+  fileList.value = []
   formDialogVisible.value = true
 }
 
-// --- 自动补全名称/规格 ---
+// --- 物料搜索 ---
-let autoFillTimer: any = null
+let searchTimer: any = null
-const onNameChange = () => {
+const handleSearchMaterialDebounced = (query: string) => {
-  clearTimeout(autoFillTimer)
+  clearTimeout(searchTimer)
-  autoFillTimer = setTimeout(() => doAutoFill(), 500)
+  searchTimer = setTimeout(() => handleSearchMaterial(query), 300)
-}
-const onNameBlur = () => {
-  clearTimeout(autoFillTimer)
-  doAutoFill()
-}
-const doAutoFill = async () => {
-  const kw = form.value.name.trim()
-  if (!kw) { autoFillHint.value = ''; return }
-  try {
-    const res: any = await autoFillPurchase(kw)
-    if (res.data) {
-      if (!form.value.spec_model && res.data.spec_model) {
-        autoFillHint.value = `已自动补全规格：${res.data.spec_model}`
-        form.value.spec_model = res.data.spec_model
-      } else if (!form.value.name && res.data.name) {
-        autoFillHint.value = `已自动补全名称：${res.data.name}`
-        form.value.name = res.data.name
-      }
-    }
-  } catch (e) { /* ignore */ }
 }
 
-// --- 价格自动计算 ---
+const handleSearchMaterial = async (query: string) => {
+  if (!query.trim()) {
+    materialOptions.value = []
+    return
+  }
+  searchLoading.value = true
+  try {
+    const res: any = await searchMaterialBase(query, 1)
+    materialOptions.value = res.data || []
+  } finally {
+    searchLoading.value = false
+  }
+}
+
+const onMaterialSelected = (id: number | null) => {
+  if (!id) {
+    materialBaseId.value = null
+    return
+  }
+  const item = materialOptions.value.find(i => i.id === id)
+  if (item) {
+    form.value.name = item.name || item.material_name || ''
+    form.value.spec_model = item.spec_model || item.spec || ''
+    materialBaseId.value = id
+    autoFillHint.value = ''
+  }
+}
+
+// --- 价格自动计算（需确认）---
+let priceConfirmTimer: any = null
 const onUnitPriceChange = (val: number | undefined) => {
-  if (val !== undefined && val > 0 && form.value.quantity > 0) {
+  if (priceConfirmTimer) clearTimeout(priceConfirmTimer)
-    const total = +(val * form.value.quantity).toFixed(2)
+  priceConfirmTimer = setTimeout(() => {
-    form.value.total_price = total
+    if (val !== undefined && val > 0 && form.value.quantity > 0 && !form.value.total_price) {
+      ElMessageBox.confirm(
+        `即将自动计算总价：${val} × ${form.value.quantity} = ${+(val * form.value.quantity).toFixed(2)}，是否继续？`,
+        '自动计算确认',
+        { confirmButtonText: '确定', cancelButtonText: '取消', type: 'info' }
+      ).then(() => {
+        form.value.total_price = +(val * form.value.quantity).toFixed(2)
+      }).catch(() => {})
+    } else if (val !== undefined && val > 0 && form.value.quantity > 0) {
+      form.value.total_price = +(val * form.value.quantity).toFixed(2)
     }
+  }, 300)
 }
+
 const onTotalPriceChange = (val: number | undefined) => {
-  if (val !== undefined && val > 0 && form.value.quantity > 0) {
+  if (priceConfirmTimer) clearTimeout(priceConfirmTimer)
-    const unit = +(val / form.value.quantity).toFixed(4)
+  priceConfirmTimer = setTimeout(() => {
-    form.value.unit_price = unit
+    if (val !== undefined && val > 0 && form.value.quantity > 0 && !form.value.unit_price) {
+      ElMessageBox.confirm(
+        `即将自动计算单价：${val} ÷ ${form.value.quantity} = ${+(val / form.value.quantity).toFixed(4)}，是否继续？`,
+        '自动计算确认',
+        { confirmButtonText: '确定', cancelButtonText: '取消', type: 'info' }
+      ).then(() => {
+        form.value.unit_price = +(val / form.value.quantity).toFixed(4)
+      }).catch(() => {})
+    } else if (val !== undefined && val > 0 && form.value.quantity > 0) {
+      form.value.unit_price = +(val / form.value.quantity).toFixed(4)
     }
+  }, 300)
 }
 
 // --- 上传 ---
@@ -421,9 +484,10 @@ const handleRemoveImage = async (uploadFile: any) => {
 
 // --- 提交 ---
 const submitForm = async () => {
-  if (!form.value.name.trim()) { ElMessage.warning('请填写采购物品名称'); return }
+  if (!form.value.name.trim()) { ElMessage.warning('请选择或填写采购物品'); return }
   if (!form.value.approver_id) { ElMessage.warning('请选择审批人'); return }
   if (!form.value.purchase_date) { ElMessage.warning('请选择采购日期'); return }
+  if (!form.value.images || form.value.images.length === 0) { ElMessage.warning('请上传至少一张图片'); return }
 
   submitLoading.value = true
   try {