From 2bc8fc431c5caad85dde9467140ffd97cea862f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?=
 <12930972+jiang-xuzhi@user.noreply.gitee.com>
Date: Mon, 31 Jul 2023 17:32:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E5=90=8D=E5=AF=B9=E7=85=A7=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/models/material.js                | 20 ++-----------------
 .../models/price-list-app-service-bj.js       |  2 +-
 .../wwwroot/models/price-list.js              |  2 +-
 .../tb_re-parts-relationship_service.js       |  6 +++---
 .../views/invoice/invoice_map_group.js        | 18 ++++++++---------
 5 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material.js
index 00f849fc..dc7ebb9e 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material.js
@@ -2,28 +2,12 @@ const schema = {
   title: "物料主数据",
   type: "object",
   properties: {
-    factory: {
-      title: "工厂",
-      type: "string",
-    },
     materialCode: {
-      title: "物料号",
+      title: "厂内物料号",
       type: "string",
     },
     materialDesc: {
-      title: "物料描述",
-      type: "string",
-    },
-    unit: {
-      title: "基本计量单位",
-      type: "string",
-    },
-    estimateType: {
-      title: "估价类",
-      type: "string",
-    },
-    estimateTypeDesc: {
-      title: "估价类描述",
+      title: "厂内物料描述",
       type: "string",
     },
   },
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js
index 29dbf9e1..027a40c6 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js
@@ -3,7 +3,7 @@ const schema = {
   type: "object",
   properties: {
     lu: {
-      title: "零件号",
+      title: "客户零件号",
       type: "string",
     },
     price: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
index 6e959596..7a5ec559 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
@@ -5,7 +5,7 @@ const schema = {
   type: "object",
   properties: {
     lu: {
-      title: "零件号",
+      title: "销售零件号",
       type: "string",
     },
     price: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
index 2bbef3be..c2fbca05 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
@@ -5,15 +5,15 @@ const schema = {
   type: "object",
   properties: {
     lu: {
-      title: "客户零件号",
+      title: "客户物料号",
       type: "string",
     },
     repLU: {
-      title: "替换客户零件号",
+      title: "替换客户物料号",
       type: "string",
     },
     businessType: {
-      title: "业务类型",
+      title: "业务分类",
       input: "select",
       options: businessTypes,
     },
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js
index 3d480ce9..52dee6a2 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js
@@ -59,27 +59,27 @@ export default {
     const model = ref({
       invoicE_WAIT_DETAIL: [
         {
-          version: 11111,
+          version: 1111,
           invbillNum: "INV230725142640-001",
           inGroupNum: "INV2023",
           lu: "lu",
-          price: 11111,
-          qty: 11111,
-          amt: 11111,
+          price: 1111,
+          qty: 1111,
+          amt: 1111,
           bussiessType: "bussiessType",
         },
         {
-          version: 22222,
+          version: 2222,
           invbillNum: "INV230725142640-002",
           inGroupNum: "INV2023",
           lu: "lu",
-          price: 22222,
-          qty: 22222,
-          amt: 22222,
+          price: 2222,
+          qty: 2222,
+          amt: 2222,
           bussiessType: "bussiessType",
         },
       ],
-      invoicE_MAP_GROUP: [{ version: "version" }],
+      invoicE_MAP_GROUP: [{ version: 1111, invbillNum: "INV230725142640-001", inGroupNum: "INV2023" }],
       invoicE_NOT_SETTLE: [{ version: "version" }],
     });