更新前端

src/views/finance/purchasingrequisition/add.vue

@@ -284,7 +284,7 @@
                   <el-col :span="12" class="mb16">
                     <el-form-item label="业务分管处室" prop="deptClassifyUserId" :required="!isDeptPurchase">
                       <el-select v-model="dataForm.deptClassifyUserId" placeholder="请选择业务分管处室" clearable filterable @change="handleBusinessDeptChange" style="width: 100%">
-                        <el-option v-for="item in businessDeptList" :key="item.id" :label="item.deptName" :value="item.username" />
+                        <el-option v-for="item in businessDeptList" :key="item.id" :label="item.deptName" :value="item.userId" />
                       </el-select>
                     </el-form-item>
                   </el-col>

src/views/finance/purchasingrequisition/index.vue

@@ -43,12 +43,11 @@
               placeholder="请选择状态" 
               clearable
               style="width: 200px">
-              <el-option label="撤回" value="-2" />
+
               <el-option label="暂存" value="-1" />
               <el-option label="运行中" value="0" />
               <el-option label="完成" value="1" />
               <el-option label="作废" value="2" />
-              <el-option label="终止" value="3" />
             </el-select>
           </el-form-item>
           <el-form-item label="是否集采" prop="isCentralized">

src/views/purchase/purchasingBusinessDept/form.vue

@@ -11,6 +11,26 @@
       :rules="dataRules" 
       label-width="120px" 
       v-loading="loading">
+      <!-- 新增时先选取用户，选后自动带出姓名、工号 -->
+      <el-form-item label="选取用户" prop="userId">
+        <org-selector 
+          v-model:orgList="userList" 
+          type="user" 
+          :multiple="false"
+          @update:orgList="handleUserChange" />
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input 
+          v-model="form.name" 
+          placeholder="选择用户后自动填充" 
+          readonly />
+      </el-form-item>
+      <el-form-item label="用户工号" prop="username">
+        <el-input 
+          v-model="form.username" 
+          placeholder="选择用户后自动填充" 
+          readonly />
+      </el-form-item>
       <el-form-item label="部门" prop="deptId">
         <org-selector 
           v-model:orgList="deptList" 
@@ -21,26 +41,7 @@
       <el-form-item label="部门名称" prop="deptName">
         <el-input 
           v-model="form.deptName" 
-          placeholder="请选择部门后自动填充" 
+          placeholder="选择部门后自动填充" 
-          readonly />
-      </el-form-item>
-      <el-form-item label="分管负责人" prop="userId">
-        <org-selector 
-          v-model:orgList="userList" 
-          type="user" 
-          :multiple="false"
-          @update:orgList="handleUserChange" />
-      </el-form-item>
-      <el-form-item label="姓名" prop="name">
-        <el-input 
-          v-model="form.name" 
-          placeholder="请选择用户后自动填充" 
-          readonly />
-      </el-form-item>
-      <el-form-item label="用户工号" prop="username">
-        <el-input 
-          v-model="form.username" 
-          placeholder="请选择用户后自动填充" 
           readonly />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
@@ -74,7 +75,7 @@ const emit = defineEmits(['refresh']);
 const dataFormRef = ref();
 const deptList = ref<any[]>([]);
 const userList = ref<any[]>([]);
-const dataForm = reactive({
+const form = reactive({
   id: '',
   deptId: '',
   deptName: '',
@@ -87,17 +88,17 @@ const visible = ref(false);
 const loading = ref(false);
 
 const dataRules = ref({
+  userId: [
+    { required: true, message: '请选取用户（分管负责人）', trigger: 'change' }
+  ],
   deptId: [
     { required: true, message: '请选择部门', trigger: 'change' }
   ],
-  userId: [
-    { required: true, message: '请选择分管负责人', trigger: 'change' }
-  ],
   name: [
-    { required: true, message: '姓名不能为空', trigger: 'blur' }
+    { required: true, message: '请先选取用户', trigger: 'blur' }
   ],
   username: [
-    { required: true, message: '用户工号不能为空', trigger: 'blur' }
+    { required: true, message: '请先选取用户', trigger: 'blur' }
   ],
 });
 
@@ -105,38 +106,38 @@ const dataRules = ref({
 const handleDeptChange = (list: any[]) => {
   if (list && list.length > 0) {
     const dept = list[0];
-    dataForm.deptId = dept.deptId || dept.id || '';
+    form.deptId = dept.deptId || dept.id || '';
-    dataForm.deptName = dept.name || dept.deptName || '';
+    form.deptName = dept.name || dept.deptName || '';
   } else {
-    dataForm.deptId = '';
+    form.deptId = '';
-    dataForm.deptName = '';
+    form.deptName = '';
   }
 };
 
-// 处理用户选择变化
+// 处理用户选择变化（选取用户后自动带出姓名、工号）
 const handleUserChange = (list: any[]) => {
   if (list && list.length > 0) {
     const user = list[0];
-    dataForm.userId = user.userId || user.id || '';
+    form.userId = user.userId || user.id || '';
-    dataForm.username = user.username || user.userName || '';
+    form.username = user.username || user.userName || '';
-    dataForm.name = user.name || user.realName || '';
+    form.name = user.name || user.realName || '';
   } else {
-    dataForm.userId = '';
+    form.userId = '';
-    dataForm.username = '';
+    form.username = '';
-    dataForm.name = '';
+    form.name = '';
   }
 };
 
 // 打开弹窗
 const openDialog = async (id?: string) => {
   visible.value = true;
-  dataForm.id = '';
+  form.id = '';
-  dataForm.deptId = '';
+  form.deptId = '';
-  dataForm.deptName = '';
+  form.deptName = '';
-  dataForm.userId = '';
+  form.userId = '';
-  dataForm.username = '';
+  form.username = '';
-  dataForm.name = '';
+  form.name = '';
-  dataForm.remark = '';
+  form.remark = '';
   deptList.value = [];
   userList.value = [];
 
@@ -148,7 +149,7 @@ const openDialog = async (id?: string) => {
       getObj({ id }).then((res: any) => {
         if (res.data && res.data.length > 0) {
           const data = res.data[0];
-          Object.assign(dataForm, {
+          Object.assign(form, {
             id: data.id || '',
             deptId: data.deptId || '',
             deptName: data.deptName || '',
@@ -201,17 +202,17 @@ const onSubmit = async () => {
       return false;
     }
 
-    if (dataForm.id) {
+    if (form.id) {
-      await putObj(dataForm);
+      await putObj(form);
       useMessage().success('编辑成功');
     } else {
-      await addObj(dataForm);
+      await addObj(form);
       useMessage().success('新增成功');
     }
     visible.value = false;
     emit('refresh');
   } catch (err: any) {
-    useMessage().error(err.msg || (dataForm.id ? '编辑失败' : '新增失败'));
+    useMessage().error(err.msg || (form.id ? '编辑失败' : '新增失败'));
   } finally {
     loading.value = false;
   }