From 995d29302ebf2672375d9c4379cc58319ac1e80e Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Wed, 24 Dec 2025 13:28:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(projectReceiving):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=88=B0=E8=B4=A7=E6=A0=87=E8=AF=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在编辑页面表单中添加是否全部到货的单选框组件
- 新增 isAllReceiving 字段到表单数据模型中
- 在列表页面表格中添加全部到货标识列并实现字典标签显示
- 更新类型定义文件，为 ProjectReceivingVO、ProjectReceivingForm 和 ProjectReceivingQuery 接口添加 isAllReceiving 属性
- 调整列表页面列配置和初始化表单数据结构以支持新字段
---
 src/api/oa/erp/projectReceiving/types.ts    | 15 +++++++++++++++
 src/views/oa/erp/projectReceiving/edit.vue  | 14 ++++++++++++++
 src/views/oa/erp/projectReceiving/index.vue | 21 +++++++++++++++------
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/api/oa/erp/projectReceiving/types.ts b/src/api/oa/erp/projectReceiving/types.ts
index c8a6de8..9e3193c 100644
--- a/src/api/oa/erp/projectReceiving/types.ts
+++ b/src/api/oa/erp/projectReceiving/types.ts
@@ -78,6 +78,11 @@ export interface ProjectReceivingVO {
    * 项目状态(1暂存 2审批中 3可用)
    */
   receivingStatus?: string;
+
+  /**
+   * 全部到货标识（0是1否）
+   */
+  isAllReceiving?: string;
 }
 
 export interface ProjectReceivingForm extends BaseEntity {
@@ -160,6 +165,11 @@ export interface ProjectReceivingForm extends BaseEntity {
    */
   receivingStatus?: string;
 
+  /**
+   * 全部到货标识（0是1否）
+   */
+  isAllReceiving?: string;
+
   /**
    * 流程编码
    */
@@ -214,6 +224,11 @@ export interface ProjectReceivingQuery extends PageQuery {
    */
   deputyId?: string | number;
 
+    /**
+   * 全部到货标识（0是1否）
+   */
+  isAllReceiving?: string;
+
   /**
    * 日期范围参数
    */
diff --git a/src/views/oa/erp/projectReceiving/edit.vue b/src/views/oa/erp/projectReceiving/edit.vue
index 2e4c3f3..44b8abb 100644
--- a/src/views/oa/erp/projectReceiving/edit.vue
+++ b/src/views/oa/erp/projectReceiving/edit.vue
@@ -48,6 +48,15 @@
               <el-date-picker v-model="form.arrivalDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择到货日期" clearable />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否全部到货" prop="isAllReceiving">
+              <el-radio-group v-model="form.isAllReceiving">
+                <el-radio v-for="dict in is_all_receiving" :key="dict.value" :label="dict.value">
+                  {{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="收货单附件" prop="ossId">
               <FileUpload v-model="ossIdString" :limit="5" />
@@ -102,6 +111,10 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
 
+const { wf_business_status, receiving_status, is_all_receiving } = toRefs<any>(
+  proxy?.useDict('wf_business_status', 'receiving_status', 'is_all_receiving')
+);
+
 // 路由参数（与项目信息保持一致）
 const routeParams = ref<Record<string, any>>({});
 
@@ -138,6 +151,7 @@ const initFormData: ProjectReceivingForm = {
   deputyId: undefined,
   deputyName: undefined as any,
   remark: undefined,
+  isAllReceiving: undefined,
   receivingStatus: '1',
   flowStatus: 'draft' as any,
   flowCode: FlowCodeEnum.PROJECT_RECEIVING_CODE,
diff --git a/src/views/oa/erp/projectReceiving/index.vue b/src/views/oa/erp/projectReceiving/index.vue
index 6b96ec6..7db084c 100644
--- a/src/views/oa/erp/projectReceiving/index.vue
+++ b/src/views/oa/erp/projectReceiving/index.vue
@@ -77,12 +77,17 @@
         <el-table-column label="部门负责人" align="center" prop="chargeName" v-if="columns[7].visible" />
         <el-table-column label="分管副总" align="center" prop="deputyName" v-if="columns[8].visible" />
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[9].visible" />
-        <el-table-column label="业务状态" align="center" prop="receivingStatus" v-if="columns[10].visible">
+        <el-table-column label="全部到货标识" align="center" prop="isAllReceiving" v-if="columns[10].visible">
+          <template #default="scope">
+            <dict-tag :options="is_all_receiving" :value="scope.row.isAllReceiving || ''" />
+          </template>
+        </el-table-column>
+        <el-table-column label="业务状态" align="center" prop="receivingStatus" v-if="columns[11].visible">
           <template #default="scope">
             <dict-tag :options="receiving_status" :value="scope.row.receivingStatus || ''" />
           </template>
         </el-table-column>
-        <el-table-column label="流程状态" align="center" v-if="columns[11].visible">
+        <el-table-column label="流程状态" align="center" v-if="columns[12].visible">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.flowStatus || 'draft'" />
           </template>
@@ -140,7 +145,9 @@ import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const router = useRouter();
 const route = useRoute();
-const { wf_business_status, receiving_status } = toRefs<any>(proxy?.useDict('wf_business_status', 'receiving_status'));
+const { wf_business_status, receiving_status, is_all_receiving } = toRefs<any>(
+  proxy?.useDict('wf_business_status', 'receiving_status', 'is_all_receiving')
+);
 
 const projectReceivingList = ref<ProjectReceivingVO[]>([]);
 const buttonLoading = ref(false);
@@ -172,8 +179,9 @@ const columns = ref<FieldOption[]>([
   { key: 7, label: `部门负责人`, visible: true },
   { key: 8, label: `分管副总`, visible: true },
   { key: 9, label: `备注`, visible: true },
-  { key: 10, label: `业务状态`, visible: true },
-  { key: 11, label: `流程状态`, visible: false }
+  { key: 10, label: `全部到货标识`, visible: true },
+  { key: 11, label: `业务状态`, visible: true },
+  { key: 12, label: `流程状态`, visible: false }
 ]);
 
 const initFormData: ProjectReceivingForm = {
@@ -185,7 +193,8 @@ const initFormData: ProjectReceivingForm = {
   ossId: undefined,
   chargeId: undefined,
   deputyId: undefined,
-  remark: undefined
+  remark: undefined,
+  isAllReceiving: undefined
 };
 const data = reactive<PageData<ProjectReceivingForm, ProjectReceivingQuery>>({
   form: { ...initFormData },