From ba4566a96be89adfbf63f6be98cbccfbd1c3714e Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 13 Nov 2025 15:09:55 +0800
Subject: [PATCH] =?UTF-8?q?1.0.31=20=E5=90=88=E5=90=8C=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86=E7=89=A9=E6=96=99=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oa/erp/contractMaterial/types.ts    | 12 +++++------
 src/views/oa/erp/contractInfo/edit.vue      | 20 ++++++++---------
 src/views/oa/erp/contractMaterial/index.vue | 24 ++++++++++-----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/api/oa/erp/contractMaterial/types.ts b/src/api/oa/erp/contractMaterial/types.ts
index f2de22d..509f8d0 100644
--- a/src/api/oa/erp/contractMaterial/types.ts
+++ b/src/api/oa/erp/contractMaterial/types.ts
@@ -5,9 +5,9 @@ export interface ContractMaterialVO {
   contractMaterialId: string | number;
 
   /**
-   * 计划标识（1计划内 2计划外）
+   * 标准物料标识（1标准物料 2非标物料）
    */
-  planFlag: string;
+  materialFlag: string;
 
   /**
    * 合同ID
@@ -98,9 +98,9 @@ export interface ContractMaterialForm extends BaseEntity {
   contractMaterialId?: string | number;
 
   /**
-   * 计划标识（1计划内 2计划外）
+   * 标准物料标识（1标准物料 2非标物料）
    */
-  planFlag?: string;
+  materialFlag?: string;
 
   /**
    * 合同ID
@@ -187,9 +187,9 @@ export interface ContractMaterialForm extends BaseEntity {
 export interface ContractMaterialQuery extends PageQuery {
 
   /**
-   * 计划标识（1计划内 2计划外）
+   * 标准物料标识（1标准物料 2非标物料）
    */
-  planFlag?: string;
+  materialFlag?: string;
 
   /**
    * 合同ID
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index 7bbc982..87a59e5 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -217,15 +217,15 @@
       <el-form ref="materialFormRef" :model="materialForm" :rules="materialRules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="计划标识" prop="planFlag">
-              <el-radio-group v-model="materialForm.planFlag">
-                <el-radio v-for="dict in plan_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+            <el-form-item label="标准物料标识" prop="materialFlag">
+              <el-radio-group v-model="materialForm.materialFlag">
+                <el-radio v-for="dict in material_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="materialName" v-if="materialForm.planFlag === '1'">
-              <el-input v-model="materialForm.materialName" placeholder="计划内请点击右侧图标检索物料">
+            <el-form-item label="物料名称" prop="materialName" v-if="materialForm.materialFlag === '1'">
+              <el-input v-model="materialForm.materialName" placeholder="请点击右侧图标检索物料">
                 <template #suffix>
                   <el-icon style="cursor: pointer" @click="openSaleMaterialSelect">
                     <Search />
@@ -235,12 +235,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="物料编号" prop="materialCode" v-if="materialForm.planFlag === '1'">
+            <el-form-item label="物料编号" prop="materialCode" v-if="materialForm.materialFlag === '1'">
               <el-input v-model="materialForm.materialCode" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="客户名称" prop="customerName" v-if="materialForm.planFlag === '1'">
+            <el-form-item label="客户名称" prop="customerName" v-if="materialForm.materialFlag === '1'">
               <el-input v-model="materialForm.customerName" disabled />
             </el-form-item>
           </el-col>
@@ -388,8 +388,8 @@ const router = useRouter();
 
 // 路由参数
 const routeParams = ref<Record<string, any>>({});
-const { contract_category, business_direction, contract_flag, contract_type, contract_status, plan_flag } = toRefs<any>(
-  proxy?.useDict('contract_category', 'business_direction', 'contract_flag', 'contract_type', 'contract_status', 'plan_flag')
+const { contract_category, business_direction, contract_flag, contract_type, contract_status, material_flag } = toRefs<any>(
+  proxy?.useDict('contract_category', 'business_direction', 'contract_flag', 'contract_type', 'contract_status', 'material_flag')
 );
 
 const buttonLoading = ref(false);
@@ -469,7 +469,7 @@ const materialDialog = reactive({
 // 合同物料表单数据
 const initMaterialFormData: ContractMaterialForm = {
   contractMaterialId: undefined,
-  planFlag: '2',
+  materialFlag: '2',
   contractId: undefined,
   productName: undefined,
   specificationDescription: undefined,
diff --git a/src/views/oa/erp/contractMaterial/index.vue b/src/views/oa/erp/contractMaterial/index.vue
index 00ea661..bf41721 100644
--- a/src/views/oa/erp/contractMaterial/index.vue
+++ b/src/views/oa/erp/contractMaterial/index.vue
@@ -4,9 +4,9 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="80px">
-            <el-form-item label="计划标识" prop="planFlag">
-              <el-select v-model="queryParams.planFlag" placeholder="请选择计划标识" clearable>
-                <el-option v-for="dict in plan_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-form-item label="标准物料标识" prop="materialFlag">
+              <el-select v-model="queryParams.materialFlag" placeholder="请选择标准物料标识" clearable>
+                <el-option v-for="dict in material_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
             <!--            <el-form-item label="合同ID" prop="contractId">-->
@@ -64,9 +64,9 @@
       <el-table v-loading="loading" border :data="contractMaterialList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="合同物料ID" align="center" prop="contractMaterialId" v-if="columns[0].visible" />
-        <el-table-column label="计划标识" align="center" prop="planFlag" v-if="columns[2].visible">
+        <el-table-column label="标准物料标识" align="center" prop="materialFlag" v-if="columns[2].visible">
           <template #default="scope">
-            <dict-tag :options="plan_flag" :value="scope.row.planFlag" />
+            <dict-tag :options="material_flag" :value="scope.row.materialFlag" />
           </template>
         </el-table-column>
         <el-table-column label="合同ID" align="center" prop="contractId" v-if="columns[3].visible" />
@@ -116,9 +116,9 @@
     <!-- 添加或修改合同物料信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="contractMaterialFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="计划标识" prop="planFlag">
-          <el-radio-group v-model="form.planFlag">
-            <el-radio v-for="dict in plan_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+        <el-form-item label="标准物料标识" prop="materialFlag">
+          <el-radio-group v-model="form.materialFlag">
+            <el-radio v-for="dict in material_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="合同ID" prop="contractId">
@@ -184,7 +184,7 @@ import {
 import { ContractMaterialVO, ContractMaterialQuery, ContractMaterialForm } from '@/api/oa/erp/contractMaterial/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { active_flag, plan_flag } = toRefs<any>(proxy?.useDict('active_flag', 'plan_flag'));
+const { active_flag, material_flag } = toRefs<any>(proxy?.useDict('active_flag', 'material_flag'));
 
 const contractMaterialList = ref<ContractMaterialVO[]>([]);
 const buttonLoading = ref(false);
@@ -207,7 +207,7 @@ const dialog = reactive<DialogOption>({
 const columns = ref<FieldOption[]>([
   { key: 0, label: `合同物料ID`, visible: false },
   { key: 1, label: `租户编号`, visible: false },
-  { key: 2, label: `计划标识`, visible: true },
+  { key: 2, label: `标准物料标识`, visible: true },
   { key: 3, label: `合同ID`, visible: true },
   { key: 4, label: `产品名称`, visible: true },
   { key: 5, label: `规格描述`, visible: true },
@@ -231,7 +231,7 @@ const columns = ref<FieldOption[]>([
 
 const initFormData: ContractMaterialForm = {
   contractMaterialId: undefined,
-  planFlag: undefined,
+  materialFlag: undefined,
   contractId: undefined,
   productName: undefined,
   specificationDescription: undefined,
@@ -251,7 +251,7 @@ const data = reactive<PageData<ContractMaterialForm, ContractMaterialQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    planFlag: undefined,
+    materialFlag: undefined,
     contractId: undefined,
     productName: undefined,
     specificationDescription: undefined,