From b792164fdbaeb68eaf09403de1b68494cbae78cd Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 13 May 2024 14:25:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B7=E6=A0=BC=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/zh-CN.ts                          |  2 +-
 .../supplierinvoiceRequestMain/index.vue      |  1 +
 .../supplierinvoiceRequestMain.data.ts        | 50 +++++++++++++------
 3 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index f97feb5a9..d9930cdca 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1018,7 +1018,7 @@ export default {
     到货检验申请生成成功:'到货检验申请生成成功',
     采购收货记录主:'采购收货记录主',
     采购退货记录主:'采购退货记录主',
-    合同附件:'合同附件t',
+    合同附件:'合同附件',
     发票附件:'发票附件',
     货运单附件:'货运单附件',
     其他附件:'其他附件',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 37ac30524..340e644e7 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -395,6 +395,7 @@ const handleImport = () => {
   /** 添加/修改操作 */
   const formRef = ref()
   const openForm = async (type : string, row ?: number) => {
+    if(row&&row.procurementCreator) row.procurementCreator = Number(row.procurementCreator)
     // 校验是否可以开票
     SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then(res => {
       if(res.flag){
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 73c75ff0d..3fbf1f305 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -28,6 +28,7 @@ const requestsettingData = data?.list[0] || {}
  userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
+ const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' })
 /**
  * @returns {Array} 采购员列表
  */
@@ -514,25 +515,44 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isForm: true,
+    isTable: false,
     form: {
-      // labelMessage: '信息提示说明！！！',
+      component: 'Select',
+      api: () => procurementCreators.list,
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        hiddenFilterButton:true,//是否隐藏筛选按钮
-        dialogWidth:'665px',//搜索出来弹窗的宽度
-        searchListPlaceholder: '请选择采购员', // 输入框占位文本
-        searchField: 'id', // 查询弹窗赋值字段
-        searchTitle: '采购员信息', // 查询弹窗标题
-        searchAllSchemas: PurchaseMemberInfo.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'roleCode', // 查询列表中字段
-          value: 'purchase', // 指查询具体值
-          isMainValue: false // 表示查询条件不是主表的字段的值
-        }]
-      }
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        }
+      },
+      // labelMessage: '信息提示说明！！！',
+      // componentProps: {
+      //   isSearchList: true, // 开启查询弹窗
+      //   hiddenFilterButton:true,//是否隐藏筛选按钮
+      //   dialogWidth:'665px',//搜索出来弹窗的宽度
+      //   searchListPlaceholder: '请选择采购员', // 输入框占位文本
+      //   searchField: 'id', // 查询弹窗赋值字段
+      //   searchTitle: '采购员信息', // 查询弹窗标题
+      //   searchAllSchemas: PurchaseMemberInfo.allSchemas, // 查询弹窗所需类
+      //   searchPage: SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode, // 查询弹窗所需分页方法
+      //   searchCondition: [{
+      //     key: 'roleCode', // 查询列表中字段
+      //     value: 'purchase', // 指查询具体值
+      //     isMainValue: false // 表示查询条件不是主表的字段的值
+      //   }]
+      // }
     }
   },
+  {
+    label: '采购价格审批人',
+    field: 'procurementCreatorName',
+    sortTableDefault:1003,
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isForm: false,
+  },
   {
     label: '采购审批时间',
     field: 'procurementCreateTime',