From a24eabc00ecf0f0d4108e655d03bc63fa584bdb8 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 7 May 2026 10:17:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=B7=AF=E5=BE=84=E4=BF=A1=E6=81=AF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=AF=E5=BE=84=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80=E5=B9=B6=E6=B7=BB=E5=8A=A0=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E6=98=8E=E7=BB=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除创建时间查询条件，简化搜索表单
- 调整表格列宽，添加序号列并显示创建人/更新人
- 重构对话框为标签页形式，新增路径明细管理功能
- 默认设置是否标识为1(是)
- 优化表单校验规则，路径编号设为必填项
---
 src/views/wcs/pathInfo/index.vue | 172 ++++++++++++++++++-------------
 1 file changed, 103 insertions(+), 69 deletions(-)

diff --git a/src/views/wcs/pathInfo/index.vue b/src/views/wcs/pathInfo/index.vue
index 53a58d4..6b3cab7 100644
--- a/src/views/wcs/pathInfo/index.vue
+++ b/src/views/wcs/pathInfo/index.vue
@@ -10,19 +10,11 @@
             <el-form-item label="路径名称" prop="pathName">
               <el-input v-model="queryParams.pathName" placeholder="请输入路径名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="是否标识：1-是；0-否" prop="isFlag">
-              <el-select v-model="queryParams.isFlag" placeholder="请选择是否标识：1-是；0-否" clearable >
+            <el-form-item label="是否标识" prop="isFlag">
+              <el-select v-model="queryParams.isFlag" placeholder="请选择是否标识" clearable>
                 <el-option v-for="dict in wcs_is_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="创建时间" prop="createdTime">
-              <el-date-picker clearable
-                v-model="queryParams.createdTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择创建时间"
-              />
-            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -53,21 +45,23 @@
 
       <el-table v-loading="loading" border :data="pathInfoList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键标识" align="center" prop="objId" v-if="true" />
+        <el-table-column label="序号" align="center" type="index" width="60" />
         <el-table-column label="路径编号" align="center" prop="pathCode" />
         <el-table-column label="路径名称" align="center" prop="pathName" />
-        <el-table-column label="是否标识：1-是；0-否" align="center" prop="isFlag">
+        <el-table-column label="是否标识" align="center" prop="isFlag">
           <template #default="scope">
             <dict-tag :options="wcs_is_flag" :value="scope.row.isFlag"/>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
+        <el-table-column label="创建时间" align="center" prop="createdTime" width="100">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+        <el-table-column label="创建人" align="center" prop="createdByName" width="100" />
+        <el-table-column label="更新人" align="center" prop="updatedByName" width="100" />
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wcs:pathInfo:edit']"></el-button>
@@ -81,36 +75,66 @@
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <!-- 添加或修改路径信息对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="pathInfoFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="路径编号" prop="pathCode">
-          <el-input v-model="form.pathCode" placeholder="请输入路径编号" />
-        </el-form-item>
-        <el-form-item label="路径名称" prop="pathName">
-          <el-input v-model="form.pathName" placeholder="请输入路径名称" />
-        </el-form-item>
-        <el-form-item label="是否标识：1-是；0-否" prop="isFlag">
-          <el-radio-group v-model="form.isFlag">
-            <el-radio
-              v-for="dict in wcs_is_flag"
-              :key="dict.value"
-              :value="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdTime">
-          <el-date-picker clearable
-            v-model="form.createdTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
+
+    <!-- 添加或修改路径信息 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
+      <el-tabs v-model="activeTab">
+        <el-tab-pane label="基本信息" name="basic">
+          <el-form ref="pathInfoFormRef" :model="form" :rules="rules" label-width="80px">
+            <el-row :gutter="16">
+              <el-col :span="12">
+                <el-form-item label="路径编号" prop="pathCode">
+                  <el-input v-model="form.pathCode" placeholder="请输入路径编号" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="路径名称" prop="pathName">
+                  <el-input v-model="form.pathName" placeholder="请输入路径名称" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="是否标识" prop="isFlag">
+                  <el-radio-group v-model="form.isFlag">
+                    <el-radio v-for="dict in wcs_is_flag" :key="dict.value" :value="parseInt(dict.value)">{{ dict.label }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="路径明细" name="detail">
+          <div class="mb-2">
+            <el-button type="primary" size="small" icon="Plus" @click="handleAddDetail">添加明细</el-button>
+          </div>
+          <el-table border :data="detailList" size="small">
+            <el-table-column label="起点" align="center" prop="startPoint">
+              <template #default="scope">
+                <el-input v-model="scope.row.startPoint" placeholder="起点" size="small" />
+              </template>
+            </el-table-column>
+            <el-table-column label="终点" align="center" prop="endPoint">
+              <template #default="scope">
+                <el-input v-model="scope.row.endPoint" placeholder="终点" size="small" />
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="remark">
+              <template #default="scope">
+                <el-input v-model="scope.row.remark" placeholder="备注" size="small" />
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="80">
+              <template #default="scope">
+                <el-button link type="danger" icon="Delete" size="small" @click="handleDelDetail(scope.$index)"></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
       <template #footer>
         <div class="dialog-footer">
           <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -124,14 +148,17 @@
 <script setup name="PathInfo" lang="ts">
 import { listPathInfo, getPathInfo, delPathInfo, addPathInfo, updatePathInfo } from '@/api/wcs/pathInfo';
 import { PathInfoVO, PathInfoQuery, PathInfoForm } from '@/api/wcs/pathInfo/types';
+import { PathDetailsVO } from '@/api/wcs/pathDetails/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wcs_is_flag } = toRefs<any>(proxy?.useDict('wcs_is_flag'));
 
 const pathInfoList = ref<PathInfoVO[]>([]);
+const detailList = ref<PathDetailsVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
+const activeTab = ref('basic');
 const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
@@ -149,32 +176,28 @@ const initFormData: PathInfoForm = {
   objId: undefined,
   pathCode: undefined,
   pathName: undefined,
-  isFlag: undefined,
+  isFlag: 1,
   remark: undefined,
-  createdTime: undefined,
 }
 const data = reactive<PageData<PathInfoForm, PathInfoQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     pathCode: undefined,
     pathName: undefined,
     isFlag: undefined,
-    createdTime: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
-    objId: [
-      { required: true, message: "主键标识不能为空", trigger: "blur" }
+    pathCode: [
+      { required: true, message: "路径编号不能为空", trigger: "blur" }
     ],
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询路径信息列表 */
 const getList = async () => {
   loading.value = true;
   const res = await listPathInfo(queryParams.value);
@@ -183,63 +206,78 @@ const getList = async () => {
   loading.value = false;
 }
 
-/** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
 }
 
-/** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData, isFlag: 1 };
+  detailList.value = [];
+  activeTab.value = 'basic';
   pathInfoFormRef.value?.resetFields();
 }
 
-/** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
 }
 
-/** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
 }
 
-/** 多选框选中数据 */
 const handleSelectionChange = (selection: PathInfoVO[]) => {
   ids.value = selection.map(item => item.objId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
 
-/** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
   dialog.title = "添加路径信息";
 }
 
-/** 修改按钮操作 */
 const handleUpdate = async (row?: PathInfoVO) => {
   reset();
   const _objId = row?.objId || ids.value[0]
   const res = await getPathInfo(_objId);
   Object.assign(form.value, res.data);
+  if (res.data.details) {
+    detailList.value = res.data.details.map((d: PathDetailsVO) => ({ ...d }));
+  }
   dialog.visible = true;
   dialog.title = "修改路径信息";
 }
 
-/** 提交按钮 */
+const handleAddDetail = () => {
+  detailList.value.push({
+    objId: undefined,
+    pathCode: form.value.pathCode || '',
+    startPoint: '',
+    endPoint: '',
+    isFlag: 1,
+    remark: '',
+    createdTime: '',
+  } as unknown as PathDetailsVO);
+}
+
+const handleDelDetail = (index: number) => {
+  detailList.value.splice(index, 1);
+}
+
 const submitForm = () => {
   pathInfoFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
+      // 将明细列表附加到表单数据
+      (form.value as any).details = detailList.value;
       if (form.value.objId) {
-        await updatePathInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await updatePathInfo(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addPathInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await addPathInfo(form.value).finally(() => buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("操作成功");
       dialog.visible = false;
@@ -248,7 +286,6 @@ const submitForm = () => {
   });
 }
 
-/** 删除按钮操作 */
 const handleDelete = async (row?: PathInfoVO) => {
   const _objIds = row?.objId || ids.value;
   await proxy?.$modal.confirm('是否确认删除路径信息编号为"' + _objIds + '"的数据项？').finally(() => loading.value = false);
@@ -257,11 +294,8 @@ const handleDelete = async (row?: PathInfoVO) => {
   await getList();
 }
 
-/** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('wcs/pathInfo/export', {
-    ...queryParams.value
-  }, `pathInfo_${new Date().getTime()}.xlsx`)
+  proxy?.download('wcs/pathInfo/export', { ...queryParams.value }, `pathInfo_${new Date().getTime()}.xlsx`)
 }
 
 onMounted(() => {