From 458804ec480b5f5c5796d2292ffd7bdf5eca2fad Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Wed, 10 Jul 2024 19:40:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRecordMain/index.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 989ffeaaf..2d7484b2e 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -191,7 +191,7 @@ const buttonBaseClick = (val, item) => {
 }
 
 const BASE_URL = getJmreportBaseUrl()
-const srcPoint = ref(BASE_URL + '/jmreport/view/970564557155733504?token=' + getAccessToken())
+const srcPoint = ref(BASE_URL + '/jmreport/view/970966724605804544?token=' + getAccessToken())
 const handleSelectionPoint = async ()=>{
   let rows:any = []
   selectionRows.value.forEach(item=>{

From 4fc03d73aa0ebb3a794472b55ea47b4a0e8edea9 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 10 Jul 2024 19:43:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=91=E7=9B=AE=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E9=85=8D=E8=B5=84=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |  1 +
 .../subjectAccount/subjectAccount.data.ts     | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index fe86384be..a335effc5 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -286,6 +286,7 @@ export enum DICT_TYPE {
   BILL_TYPE = 'bill_type', // 发票类型
   CONTAIN_MANAGE_TYPE = 'contain_menage_type', //器具管理类型
   INVOICE_BALANCE_STATEMENT_STATUS = 'invoice_balance_statement_status', //是否有价差
+  PL_MSTR_TYPE = 'pl_mstr_type', //产品类类型
 
   // ========== 业务 - mes ==========
   MESDO_STATUS = 'mes_do_status', // 工单执行状态
diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
index ac575491b..5a3a0f763 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
@@ -17,6 +17,7 @@ export const SubjectAccountRules = reactive({
   projectId: [required],
   projectCode: [required],
   available: [required],
+  isFromPlMstr:[required]
 })
 
 export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
@@ -180,6 +181,42 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '是否来自产品类',
+    field: 'isFromPlMstr',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 140
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '产品类类型',
+    field: 'plMstrType',
+    sort: 'custom',
+    isSearch: false,
+    dictType: DICT_TYPE.PL_MSTR_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form:{
+      componentProps:{
+        disabled:false
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',

From 0d65f757fe9bff3b0247bc0e52f3cbce71dc53ab Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 10 Jul 2024 19:52:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=8D=A2field?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinsh/repleinshJobMain/repleinshJobMain.data.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index 9fee8806c..146cbd97e 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -440,7 +440,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '承接人用户名',
-    field: 'acceptUserId',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -449,7 +449,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '完成人用户名',
-    field: 'completeUserId',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150