From b19cfd7864f657e73946f755bfa802a32715abe8 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 13 Oct 2025 17:45:21 +0800
Subject: [PATCH] =?UTF-8?q?1.0.9=20=E6=B7=BB=E5=8A=A0=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                          |  14 +-
 src/views/oa/base/relationMateriel/index.vue | 338 -------------------
 src/views/oa/erp/contractInfo/edit.vue       | 234 +++++++++++++
 src/views/oa/erp/contractInfo/index.vue      | 259 +++-----------
 4 files changed, 291 insertions(+), 554 deletions(-)
 delete mode 100644 src/views/oa/base/relationMateriel/index.vue
 create mode 100644 src/views/oa/erp/contractInfo/edit.vue

diff --git a/src/router/index.ts b/src/router/index.ts
index 778f222..4329014 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -93,7 +93,19 @@ export const constantRoutes: RouteRecordRaw[] = [
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
-  }
+  },
+  {
+    path: '/oa/erp',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'contractInfo/edit',
+        component: () => import('@/views/oa/erp/contractInfo/edit.vue'),
+        name: 'edit',
+      }
+    ]
+  },
 ];
 
 // 动态路由，基于用户权限动态去加载
diff --git a/src/views/oa/base/relationMateriel/index.vue b/src/views/oa/base/relationMateriel/index.vue
deleted file mode 100644
index 1cecf8b..0000000
--- a/src/views/oa/base/relationMateriel/index.vue
+++ /dev/null
@@ -1,338 +0,0 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
-            <el-form-item label="SAP物料编码" prop="materielCode">
-              <el-input v-model="queryParams.materielCode" placeholder="请输入SAP物料编码" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="SAP物料名称" prop="materielName">
-              <el-input v-model="queryParams.materielName" placeholder="请输入SAP物料名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="客户名称" prop="customerId">
-              <el-select v-model="queryParams.customerId" placeholder="请选择客户名称" filterable clearable @keyup.enter="handleQuery">
-                <el-option v-for="item in customerInfoList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="销售物料名称" prop="saleMaterielName">
-              <el-input v-model="queryParams.saleMaterielName" placeholder="请输入销售物料名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="激活标识" prop="activeFlag">
-              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
-                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
-
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/base:relationMateriel:add']">新增 </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/base:relationMateriel:edit']"
-              >修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/base:relationMateriel:remove']"
-              >删除
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/base:relationMateriel:export']">导出 </el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" border :data="relationMaterielList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="关联物料ID" align="center" prop="relationMaterielId" v-if="columns[0].visible" />
-        <el-table-column label="物料名称" align="center" prop="materielName" v-if="columns[2].visible" />
-        <el-table-column label="客户名称" align="center" prop="customerName" v-if="columns[3].visible" />
-        <el-table-column label="销售物料名称" align="center" prop="saleMaterielName" v-if="columns[4].visible" />
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible" />
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
-          <template #default="scope">
-            <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/base:relationMateriel:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['oa/base:relationMateriel:remove']"
-              ></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <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="relationMaterielFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="物料名称" prop="materielId">
-          <el-input v-model="form.materielName" placeholder="请点击右侧图标检索物料" readonly>
-            <template #suffix>
-              <el-icon style="cursor: pointer" @click="openUserSelect">
-                <Search />
-              </el-icon>
-            </template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="客户名称" prop="customerId">
-          <el-select v-model="form.customerId" placeholder="请选择所属客户" filterable clearable>
-            <el-option v-for="item in customerInfoList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="销售物料名称" prop="saleMaterielName">
-          <el-input v-model="form.saleMaterielName" placeholder="请输入销售物料名称" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="激活标识" prop="activeFlag">
-          <el-radio-group v-model="form.activeFlag">
-            <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-    <!-- 申请人 -->
-    <MaterielSelect ref="userSelectRef" :multiple="false" :data="selectUserIds" @confirm-call-back="userSelectCallBack"></MaterielSelect>
-  </div>
-</template>
-
-<script setup name="RelationMateriel" lang="ts">
-import {
-  listRelationMateriel,
-  getRelationMateriel,
-  delRelationMateriel,
-  addRelationMateriel,
-  updateRelationMateriel
-} from '@/api/oa/base/relationMateriel';
-import { RelationMaterielVO, RelationMaterielQuery, RelationMaterielForm } from '@/api/oa/base/relationMateriel/types';
-import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo';
-import { ref } from 'vue';
-import MaterielSelect from 'src/components/MaterialSelect';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
-
-const relationMaterielList = ref<RelationMaterielVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const relationMaterielFormRef = ref<ElFormInstance>();
-
-const userSelectRef = ref<InstanceType<typeof MaterielSelect>>();
-//申请人id
-const selectUserIds = ref<Array<number | string>>([]);
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-/** 查询客户信息下拉框结构 */
-const customerInfoList = ref([]);
-const getCustomerInfoListSelect = async () => {
-  let res = await getCrmCustomerInfoList(null);
-  customerInfoList.value = res.data;
-};
-
-// 列显隐信息
-const columns = ref<FieldOption[]>([
-  { key: 0, label: `关联物料名称`, visible: false },
-  { key: 1, label: `租户编号`, visible: true },
-  { key: 2, label: `物料名称`, visible: true },
-  { key: 3, label: `客户名称`, visible: true },
-  { key: 4, label: `销售物料名称`, visible: true },
-  { key: 5, label: `备注`, visible: true },
-  { key: 6, label: `激活标识`, visible: true },
-  { key: 7, label: `删除标志`, visible: true },
-  { key: 8, label: `创建部门`, visible: true },
-  { key: 9, label: `创建人`, visible: true },
-  { key: 10, label: `创建时间`, visible: true },
-  { key: 11, label: `更新人`, visible: true },
-  { key: 12, label: `更新时间`, visible: true }
-]);
-
-const initFormData: RelationMaterielForm = {
-  relationMaterielId: undefined,
-  materielId: undefined,
-  materielCode: undefined,
-  materielName: undefined,
-  customerId: undefined,
-  customerName: undefined,
-  saleMaterielName: undefined,
-  remark: undefined,
-  activeFlag: undefined
-};
-const data = reactive<PageData<RelationMaterielForm, RelationMaterielQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    materielId: undefined,
-    materielCode: undefined,
-    materielName: undefined,
-    customerId: undefined,
-    customerName: undefined,
-    saleMaterielName: undefined,
-    activeFlag: undefined,
-    params: {}
-  },
-  rules: {
-    materielId: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
-    customerId: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询关联销售物料信息列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listRelationMateriel(queryParams.value);
-  relationMaterielList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-};
-
-//打开申请人选择
-const openUserSelect = () => {
-  userSelectRef.value.open();
-};
-
-//确认选择申请人
-const userSelectCallBack = (data) => {
-  const materielList = data;
-  console.log(materielList);
-  if (materielList.length > 0) {
-    form.value.materielId = materielList[0].materielId;
-    form.value.materielName = materielList[0].materielName;
-  }
-};
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  relationMaterielFormRef.value?.resetFields();
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-};
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: RelationMaterielVO[]) => {
-  ids.value = selection.map((item) => item.relationMaterielId);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加关联销售物料信息';
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: RelationMaterielVO) => {
-  reset();
-  const _relationMaterielId = row?.relationMaterielId || ids.value[0];
-  const res = await getRelationMateriel(_relationMaterielId);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改关联销售物料信息';
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  relationMaterielFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.relationMaterielId) {
-        await updateRelationMateriel(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addRelationMateriel(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: RelationMaterielVO) => {
-  const _relationMaterielIds = row?.relationMaterielId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除关联销售物料信息编号为"' + _relationMaterielIds + '"的数据项？').finally(() => (loading.value = false));
-  await delRelationMateriel(_relationMaterielIds);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'oa/base/relationMateriel/export',
-    {
-      ...queryParams.value
-    },
-    `relationMateriel_${new Date().getTime()}.xlsx`
-  );
-};
-
-onMounted(() => {
-  getCustomerInfoListSelect();
-  getList();
-});
-</script>
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
new file mode 100644
index 0000000..dbaf107
--- /dev/null
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -0,0 +1,234 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never">
+      <template #header>
+        <div style="text-align: left; font-weight: bold; font-size: 24px;">合同{{ form.contractId ? ' - 修改' : ' - 新增' }}</div>
+      </template>
+      <el-form ref="contractInfoFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="有无合同" prop="contractFlag">
+              <el-radio-group v-model="form.contractFlag">
+                <el-radio v-for="dict in contract_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同编号" prop="contractCode">
+              <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同名称" prop="contractName">
+              <el-input v-model="form.contractName" placeholder="请输入合同名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同大类" prop="contractCategory">
+              <el-select v-model="form.contractCategory" placeholder="请选择合同大类">
+                <el-option v-for="dict in contract_category" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同类型" prop="contractType">
+              <el-select v-model="form.contractType" placeholder="请选择合同类型">
+                <el-option v-for="dict in contract_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务方向" prop="businessDirection">
+              <el-select v-model="form.businessDirection" placeholder="请选择业务方向">
+                <el-option v-for="dict in business_direction" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门" prop="contractDeptId">
+              <el-input v-model="form.contractDeptId" placeholder="请输入部门" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同时间" prop="contractDate">
+              <el-date-picker clearable v-model="form.contractDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择合同时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同总价" prop="totalPrice">
+              <el-input v-model="form.totalPrice" placeholder="请输入合同总价" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="甲方公司" prop="aCustomerId">
+              <el-input v-model="form.aCustomerId" placeholder="请输入甲方公司" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="甲方授权代表" prop="aRepresent">
+              <el-input v-model="form.aRepresent" placeholder="请输入甲方授权代表" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="甲方签字日期" prop="aDate">
+              <el-date-picker clearable v-model="form.aDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择甲方签字日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="乙方公司" prop="bCustomerId">
+              <el-input v-model="form.bCustomerId" placeholder="请输入乙方公司" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="乙方授权代表" prop="bRepresent">
+              <el-input v-model="form.bRepresent" placeholder="请输入乙方授权代表" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="乙方签字日期" prop="bDate">
+              <el-date-picker clearable v-model="form.bDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择乙方签字日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同状态" prop="contractStatus">
+              <el-radio-group v-model="form.contractStatus">
+                <el-radio v-for="dict in contract_status" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="流程状态" prop="flowStatus">
+              <el-input v-model="form.flowStatus" placeholder="请输入流程状态" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同模板ID" prop="templateId">
+              <el-input v-model="form.templateId" placeholder="请输入合同模板ID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="附件ID" prop="ossId">
+              <el-input v-model="form.ossId" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="付款方式" prop="paymentMethod">
+              <el-input v-model="form.paymentMethod" placeholder="请输入付款方式" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="签字合同附件" prop="signatureAppendix">
+              <el-input v-model="form.signatureAppendix" placeholder="请输入签字合同附件" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同税率(预留)" prop="taxRate">
+              <el-input v-model="form.taxRate" placeholder="请输入合同税率(预留)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-radio-group v-model="form.activeFlag">
+                <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item>
+              <el-button :loading="buttonLoading" type="primary" @click="submitForm">保 存</el-button>
+              <el-button @click="goBack">返 回</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script setup name="ContractInfoEdit" lang="ts">
+import { addContractInfo, getContractInfo, updateContractInfo } from '@/api/oa/erp/contractInfo';
+import { ContractInfoForm } from '@/api/oa/erp/contractInfo/types';
+
+const route = useRoute();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { contract_category, business_direction, active_flag, contract_flag, contract_type, contract_status } = toRefs<any>(
+  proxy?.useDict('contract_category', 'business_direction', 'active_flag', 'contract_flag', 'contract_type', 'contract_status')
+);
+
+const buttonLoading = ref(false);
+const contractInfoFormRef = ref<ElFormInstance>();
+
+const initFormData: ContractInfoForm = {
+  contractId: undefined,
+  contractFlag: undefined,
+  contractCode: undefined,
+  contractName: undefined,
+  contractCategory: undefined,
+  contractType: undefined,
+  businessDirection: undefined,
+  contractDeptId: undefined,
+  contractDate: undefined,
+  totalPrice: undefined,
+  aCustomerId: undefined,
+  aRepresent: undefined,
+  aDate: undefined,
+  bCustomerId: undefined,
+  bRepresent: undefined,
+  bDate: undefined,
+  contractStatus: undefined,
+  flowStatus: undefined,
+  templateId: undefined,
+  ossId: undefined,
+  paymentMethod: undefined,
+  signatureAppendix: undefined,
+  taxRate: undefined,
+  remark: undefined,
+  activeFlag: undefined
+};
+
+const data = reactive<{ form: ContractInfoForm; rules: any }>({
+  form: { ...initFormData },
+  rules: {
+    contractId: [{ required: true, message: '合同ID不能为空', trigger: 'blur' }]
+  }
+});
+
+const { form, rules } = toRefs(data);
+
+const goBack = () => {
+  proxy?.$tab.closePage();
+};
+
+const submitForm = () => {
+  contractInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.contractId) {
+        await updateContractInfo(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addContractInfo(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      goBack();
+    }
+  });
+};
+
+onMounted(async () => {
+  const id = (route.query.id || route.params.id) as string | number;
+  if (id) {
+    const res = await getContractInfo(id);
+    Object.assign(form.value, res.data);
+  }
+});
+</script>
+
+
diff --git a/src/views/oa/erp/contractInfo/index.vue b/src/views/oa/erp/contractInfo/index.vue
index e01c7cd..a654bc9 100644
--- a/src/views/oa/erp/contractInfo/index.vue
+++ b/src/views/oa/erp/contractInfo/index.vue
@@ -3,44 +3,44 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
-<!--            <el-form-item label="有无合同" prop="contractFlag">-->
-<!--              <el-select v-model="queryParams.contractFlag" placeholder="请选择有无合同" clearable>-->
-<!--                <el-option v-for="dict in contract_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="80px">
+            <!--            <el-form-item label="有无合同" prop="contractFlag">-->
+            <!--              <el-select v-model="queryParams.contractFlag" placeholder="请选择有无合同" clearable>-->
+            <!--                <el-option v-for="dict in contract_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
             <el-form-item label="合同编号" prop="contractCode">
               <el-input v-model="queryParams.contractCode" placeholder="请输入合同编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="合同名称" prop="contractName">
               <el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-<!--            <el-form-item label="合同大类" prop="contractCategory">-->
-<!--              <el-select v-model="queryParams.contractCategory" placeholder="请选择合同大类" clearable>-->
-<!--                <el-option v-for="dict in contract_category" :key="dict.value" :label="dict.label" :value="dict.value" />-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="合同类型" prop="contractType">-->
-<!--              <el-select v-model="queryParams.contractType" placeholder="请选择合同类型" clearable>-->
-<!--                <el-option v-for="dict in contract_type" :key="dict.value" :label="dict.label" :value="dict.value" />-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
+            <!--            <el-form-item label="合同大类" prop="contractCategory">-->
+            <!--              <el-select v-model="queryParams.contractCategory" placeholder="请选择合同大类" clearable>-->
+            <!--                <el-option v-for="dict in contract_category" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="合同类型" prop="contractType">-->
+            <!--              <el-select v-model="queryParams.contractType" placeholder="请选择合同类型" clearable>-->
+            <!--                <el-option v-for="dict in contract_type" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
             <el-form-item label="业务方向" prop="businessDirection">
               <el-select v-model="queryParams.businessDirection" placeholder="请选择业务方向" clearable>
                 <el-option v-for="dict in business_direction" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-<!--            <el-form-item label="部门" prop="contractDeptId">-->
-<!--              <el-input v-model="queryParams.contractDeptId" placeholder="请输入部门" clearable @keyup.enter="handleQuery" />-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="合同状态" prop="contractStatus">-->
-<!--              <el-select v-model="queryParams.contractStatus" placeholder="请选择合同状态" clearable>-->
-<!--                <el-option v-for="dict in contract_status" :key="dict.value" :label="dict.label" :value="dict.value" />-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="流程状态" prop="flowStatus">-->
-<!--              <el-input v-model="queryParams.flowStatus" placeholder="请输入流程状态" clearable @keyup.enter="handleQuery" />-->
-<!--            </el-form-item>-->
+            <!--            <el-form-item label="部门" prop="contractDeptId">-->
+            <!--              <el-input v-model="queryParams.contractDeptId" placeholder="请输入部门" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="合同状态" prop="contractStatus">-->
+            <!--              <el-select v-model="queryParams.contractStatus" placeholder="请选择合同状态" clearable>-->
+            <!--                <el-option v-for="dict in contract_status" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="流程状态" prop="flowStatus">-->
+            <!--              <el-input v-model="queryParams.flowStatus" placeholder="请输入流程状态" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -81,8 +81,8 @@
             <dict-tag :options="contract_flag" :value="scope.row.contractFlag" />
           </template>
         </el-table-column>
-        <el-table-column label="合同编号" align="center" prop="contractCode" v-if="columns[3].visible" />
-        <el-table-column label="合同名称" align="center" prop="contractName" v-if="columns[4].visible" />
+        <el-table-column label="合同编号" align="center" prop="contractCode" width="120" v-if="columns[3].visible" />
+        <el-table-column label="合同名称" align="center" prop="contractName" width="120" v-if="columns[4].visible" />
         <el-table-column label="合同大类" align="center" prop="contractCategory" v-if="columns[5].visible">
           <template #default="scope">
             <dict-tag :options="contract_category" :value="scope.row.contractCategory" />
@@ -99,24 +99,24 @@
           </template>
         </el-table-column>
         <el-table-column label="部门" align="center" prop="contractDeptId" v-if="columns[8].visible" />
-        <el-table-column label="合同时间" align="center" prop="contractDate" width="180" v-if="columns[9].visible">
+        <el-table-column label="合同时间" align="center" prop="contractDate" width="100" v-if="columns[9].visible">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.contractDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <span>{{ parseTime(scope.row.contractDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="合同总价" align="center" prop="totalPrice" v-if="columns[10].visible" />
         <el-table-column label="甲方公司" align="center" prop="aCustomerId" v-if="columns[11].visible" />
-        <el-table-column label="甲方授权代表" align="center" prop="aRepresent" v-if="columns[12].visible" />
-        <el-table-column label="甲方签字日期" align="center" prop="aDate" width="180" v-if="columns[13].visible">
+        <el-table-column label="甲方授权代表" align="center" prop="aRepresent" width="110" v-if="columns[12].visible" />
+        <el-table-column label="甲方签字日期" align="center" prop="aDate" width="120" v-if="columns[13].visible">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.aDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <span>{{ parseTime(scope.row.aDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="乙方公司" align="center" prop="bCustomerId" v-if="columns[14].visible" />
-        <el-table-column label="乙方授权代表" align="center" prop="bRepresent" v-if="columns[15].visible" />
-        <el-table-column label="乙方签字日期" align="center" prop="bDate" width="180" v-if="columns[16].visible">
+        <el-table-column label="乙方授权代表" align="center" prop="bRepresent" width="110" v-if="columns[15].visible" />
+        <el-table-column label="乙方签字日期" align="center" prop="bDate" width="120" v-if="columns[16].visible">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.bDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <span>{{ parseTime(scope.row.bDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="合同状态" align="center" prop="contractStatus" v-if="columns[17].visible">
@@ -162,110 +162,12 @@
 
       <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="contractInfoFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="有无合同" prop="contractFlag">
-          <el-radio-group v-model="form.contractFlag">
-            <el-radio v-for="dict in contract_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="合同编号" prop="contractCode">
-          <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
-        </el-form-item>
-        <el-form-item label="合同名称" prop="contractName">
-          <el-input v-model="form.contractName" placeholder="请输入合同名称" />
-        </el-form-item>
-        <el-form-item label="合同大类" prop="contractCategory">
-          <el-select v-model="form.contractCategory" placeholder="请选择合同大类">
-            <el-option v-for="dict in contract_category" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="合同类型" prop="contractType">
-          <el-select v-model="form.contractType" placeholder="请选择合同类型">
-            <el-option v-for="dict in contract_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="业务方向" prop="businessDirection">
-          <el-select v-model="form.businessDirection" placeholder="请选择业务方向">
-            <el-option v-for="dict in business_direction" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="部门" prop="contractDeptId">
-          <el-input v-model="form.contractDeptId" placeholder="请输入部门" />
-        </el-form-item>
-        <el-form-item label="合同时间" prop="contractDate">
-          <el-date-picker clearable v-model="form.contractDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择合同时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="合同总价" prop="totalPrice">
-          <el-input v-model="form.totalPrice" placeholder="请输入合同总价" />
-        </el-form-item>
-        <el-form-item label="甲方公司" prop="aCustomerId">
-          <el-input v-model="form.aCustomerId" placeholder="请输入甲方公司" />
-        </el-form-item>
-        <el-form-item label="甲方授权代表" prop="aRepresent">
-          <el-input v-model="form.aRepresent" placeholder="请输入甲方授权代表" />
-        </el-form-item>
-        <el-form-item label="甲方签字日期" prop="aDate">
-          <el-date-picker clearable v-model="form.aDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择甲方签字日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="乙方公司" prop="bCustomerId">
-          <el-input v-model="form.bCustomerId" placeholder="请输入乙方公司" />
-        </el-form-item>
-        <el-form-item label="乙方授权代表" prop="bRepresent">
-          <el-input v-model="form.bRepresent" placeholder="请输入乙方授权代表" />
-        </el-form-item>
-        <el-form-item label="乙方签字日期" prop="bDate">
-          <el-date-picker clearable v-model="form.bDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择乙方签字日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="合同状态" prop="contractStatus">
-          <el-radio-group v-model="form.contractStatus">
-            <el-radio v-for="dict in contract_status" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="流程状态" prop="flowStatus">
-          <el-input v-model="form.flowStatus" placeholder="请输入流程状态" />
-        </el-form-item>
-        <el-form-item label="合同模板ID" prop="templateId">
-          <el-input v-model="form.templateId" placeholder="请输入合同模板ID" />
-        </el-form-item>
-        <el-form-item label="附件ID" prop="ossId">
-          <el-input v-model="form.ossId" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="付款方式" prop="paymentMethod">
-          <el-input v-model="form.paymentMethod" placeholder="请输入付款方式" />
-        </el-form-item>
-        <el-form-item label="签字合同附件" prop="signatureAppendix">
-          <el-input v-model="form.signatureAppendix" placeholder="请输入签字合同附件" />
-        </el-form-item>
-        <el-form-item label="合同税率(预留)" prop="taxRate">
-          <el-input v-model="form.taxRate" placeholder="请输入合同税率(预留)" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="激活标识" prop="activeFlag">
-          <el-radio-group v-model="form.activeFlag">
-            <el-radio v-for="dict in active_flag" :key="dict.value" :value="dict.value">{{ dict.label }} </el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
 <script setup name="ContractInfo" lang="ts">
-import { listContractInfo, getContractInfo, delContractInfo, addContractInfo, updateContractInfo } from '@/api/oa/erp/contractInfo';
-import { ContractInfoVO, ContractInfoQuery, ContractInfoForm } from '@/api/oa/erp/contractInfo/types';
+import { listContractInfo, delContractInfo } from '@/api/oa/erp/contractInfo';
+import { ContractInfoVO, ContractInfoQuery } from '@/api/oa/erp/contractInfo/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { contract_category, business_direction, active_flag, contract_flag, contract_type, contract_status } = toRefs<any>(
@@ -273,7 +175,6 @@ const { contract_category, business_direction, active_flag, contract_flag, contr
 );
 
 const contractInfoList = ref<ContractInfoVO[]>([]);
-const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
@@ -282,12 +183,6 @@ const multiple = ref(true);
 const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
-const contractInfoFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
@@ -325,35 +220,7 @@ const columns = ref<FieldOption[]>([
   { key: 31, label: `更新时间`, visible: false }
 ]);
 
-const initFormData: ContractInfoForm = {
-  contractId: undefined,
-  contractFlag: undefined,
-  contractCode: undefined,
-  contractName: undefined,
-  contractCategory: undefined,
-  contractType: undefined,
-  businessDirection: undefined,
-  contractDeptId: undefined,
-  contractDate: undefined,
-  totalPrice: undefined,
-  aCustomerId: undefined,
-  aRepresent: undefined,
-  aDate: undefined,
-  bCustomerId: undefined,
-  bRepresent: undefined,
-  bDate: undefined,
-  contractStatus: undefined,
-  flowStatus: undefined,
-  templateId: undefined,
-  ossId: undefined,
-  paymentMethod: undefined,
-  signatureAppendix: undefined,
-  taxRate: undefined,
-  remark: undefined,
-  activeFlag: undefined
-};
-const data = reactive<PageData<ContractInfoForm, ContractInfoQuery>>({
-  form: { ...initFormData },
+const data = reactive<{ queryParams: ContractInfoQuery }>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -381,13 +248,10 @@ const data = reactive<PageData<ContractInfoForm, ContractInfoQuery>>({
     taxRate: undefined,
     activeFlag: undefined,
     params: {}
-  },
-  rules: {
-    contractId: [{ required: true, message: '合同ID不能为空', trigger: 'blur' }]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams } = toRefs(data);
 
 /** 查询合同信息列表 */
 const getList = async () => {
@@ -398,18 +262,6 @@ const getList = async () => {
   loading.value = false;
 };
 
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  contractInfoFormRef.value?.resetFields();
-};
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
@@ -431,36 +283,13 @@ const handleSelectionChange = (selection: ContractInfoVO[]) => {
 
 /** 新增按钮操作 */
 const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加合同信息';
+  proxy?.$tab.openPage('/oa/erp/contractInfo/edit', '添加市场销售合同');
 };
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: ContractInfoVO) => {
-  reset();
+const handleUpdate = (row?: ContractInfoVO) => {
   const _contractId = row?.contractId || ids.value[0];
-  const res = await getContractInfo(_contractId);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改合同信息';
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  contractInfoFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.contractId) {
-        await updateContractInfo(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addContractInfo(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
+  proxy?.$tab.openPage(`/oa/erp/contractInfo/edit`, '合同信息-修改', { id: _contractId });
 };
 
 /** 删除按钮操作 */