From fcb1f822b0df73656f12b3a4f4a7ae058425156c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 7 Apr 2023 12:01:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E8=BD=AC?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/commonTabel-drawer/index.vue   |  2 +-
 fe/PC/src/utils/detailsTableColumns/index.js  | 49 +++++++++++--------
 fe/PC/src/utils/tableColumns/index.js         |  6 +--
 fe/PC/src/utils/tabsDesTions/index.js         |  6 +--
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/fe/PC/src/components/commonTabel-drawer/index.vue b/fe/PC/src/components/commonTabel-drawer/index.vue
index c45b70de8..c1029a1cd 100644
--- a/fe/PC/src/components/commonTabel-drawer/index.vue
+++ b/fe/PC/src/components/commonTabel-drawer/index.vue
@@ -97,7 +97,7 @@
           <umyTable
             v-if="scope.value == 'hz'"
             :tableData="propsData.summaryDetails"
-            :tableColumns="summaryTableColumns.length==0?tableColumns:summaryTableColumns"
+            :tableColumns="summaryTableColumns.length == 0 ? tableColumns : summaryTableColumns"
             :selectionTable="selectionTable"
             :requiredRules="false"
             @sortChange="sortChange"
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 9e5febcb2..047f8c721 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -283,9 +283,9 @@ export const InspectNote =  [
   { label: "破坏数量", prop: 'crackQty' },
   { label: "最终不合格数量", prop: 'notPassedQty' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: 'creatorId' },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: 'lastModifierId' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "单据号", prop: 'number' },
   { label: "备注", prop: 'remark' },
   { label: "供应商批次", prop: 'supplierBatch' },
@@ -307,18 +307,19 @@ export const InspectNote =  [
   { label: "检验人姓名", prop: 'inspectUserName' },
   { label: "检验人电话", prop: 'inspectUserPhone' },
   { label: "status", prop: 'status' },
-  { label: "masterID", prop: "masterID" },
+  { label: "主表ID", prop: "masterID" },
   { label: "inspectType", prop: 'inspectType' },
   { label: "ID", prop: "id" },
   // { label: "其他属性", prop: 'otherPropertyJson' },
   // -----------------------------------------------------------------------
 ]
 
-// 不合格转合格记录 已调整
+// 不合格转合格记录 已调整 20230407
 export const unqualifiedToQualifiedNote = [
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "toLot" },
@@ -328,15 +329,15 @@ export const unqualifiedToQualifiedNote = [
   { label: "ERP库位", prop: 'toLocationErpCode' },
   // -----------------------------------------------------------------------
   { label: "转合格单号", prop: "number",width: orderWidth },
-  { label: "发货单号", prop: "asnNumber",width: orderWidth },
-  { label: "标包单位", prop: 'stdPackUom' },
+  // { label: "发货单号", prop: "asnNumber",width: orderWidth },
+  // { label: "标包单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "来源箱码", prop: 'fromPackingCode' },
   { label: "来源批次", prop: 'fromLot' },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "完成时间", prop: 'arriveDate' },
-  { label: "生产时间", prop: 'produceDate' },
-  { label: "过期时间", prop: 'expireDate' },
+  { label: "完成时间", prop: 'arriveDate', type: "dateTime" },
+  { label: "生产时间", prop: 'produceDate', type: "dateTime" },
+  { label: "过期时间", prop: 'expireDate', type: "dateTime" },
   { label: "来源库区", prop: 'fromLocationArea' },
   { label: "目标库区", prop: 'toLocationArea' },
   { label: "来源库位组", prop: 'fromLocationGroup' },
@@ -346,10 +347,18 @@ export const unqualifiedToQualifiedNote = [
   { label: "目标仓库", prop: 'toWarehouseCode' },
   { label: "fromStatus", prop: 'fromStatus' },
   { label: "toStatus", prop: 'toStatus' },
-  { label: "到货单号", prop: 'arriveNoticeNumber',width: orderWidth },
-  { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
-  { label: "订单号", prop: 'poNumber',width: orderWidth },
-  { label: "供应商代码", prop: 'supplierCode' },
+  // { label: "到货单号", prop: 'arriveNoticeNumber',width: orderWidth },
+  // { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
+  // { label: "订单号", prop: 'poNumber',width: orderWidth },
+  // { label: "供应商代码", prop: 'supplierCode' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "备注", prop: 'remark' },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
+  { label: "主表ID", prop: "masterID" },
+  { label: "ID", prop: "id" },
   // { label: "检验完成时间", prop: "completeTime",type: "dateTime" },
   // -----------------------------------------------------------------------
 ]
@@ -2262,7 +2271,7 @@ export const InventoryInitialNote = [
   { label: "监盘操作员", prop: 'auditCountOperator' },
   { label: "监盘描述", prop: 'auditCountDescription' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "masterID", prop: "masterID" },
+  { label: "主表ID", prop: "masterID" },
   { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
@@ -2314,7 +2323,7 @@ export const CountPlan =  [
   { label: "过期时间", prop: 'expireDate', type: "dateTime" },
   { label: "托标签", prop: "containerCode" },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "masterID", prop: "masterID" },
+  { label: "主表ID", prop: "masterID" },
   { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
@@ -2355,7 +2364,7 @@ export const CountJob =  [
   { label: "监盘操作员", prop: 'auditCountOperator' },
   { label: "监盘描述", prop: 'auditCountDescription' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "masterID", prop: "masterID" },
+  { label: "主表ID", prop: "masterID" },
   { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
@@ -2410,7 +2419,7 @@ export const CountNote =  [
   { label: "过期时间", prop: "expireDate",type: "dateTime" },
   { label: "托标签", prop: "containerCode" },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "masterID", prop: "masterID" },
+  { label: "主表ID", prop: "masterID" },
   { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
@@ -2450,7 +2459,7 @@ export const CountPlanAdjust =  [
   { label: "过期时间", prop: "expireDate",type: "dateTime" },
   // { label: "托标签", prop: "containerCode" },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "masterID", prop: "masterID" },
+  { label: "主表ID", prop: "masterID" },
   { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
@@ -2495,7 +2504,7 @@ export const CountPlanAdjust =  [
   { label: "托标签", prop: "containerCode" },
   { label: "盘点标签", prop: "countLabel" },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "masterID", prop: "masterID" },
+  { label: "主表ID", prop: "masterID" },
   { label: "ID", prop: "id" },
   // -----------------------------------------------------------------------
 ]
\ No newline at end of file
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 4ebcb686d..737b3671d 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1541,7 +1541,7 @@ export const unqualifiedToQualified = [
   { label: "status", prop: 'status' },
   // -----------------------------------------------------------------------
 ]
-// 不合格转合格记录 已调整
+// 不合格转合格记录 已调整 20230407
 export const unqualifiedToQualifiedNote = [
   {
     label: "转合格单号",
@@ -1554,9 +1554,9 @@ export const unqualifiedToQualifiedNote = [
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库", prop: 'warehouseCode' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   // -----------------------------------------------------------------------
 ]
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index c27a72543..e5eecceff 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1046,7 +1046,7 @@ export const InspectNote = [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 不合格转合格记录 已调整 20221220
+// 不合格转合格记录 已调整 20230407
 export const unqualifiedToQualifiedNote = [
   { label: "转合格单号", prop: "number" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -1058,9 +1058,9 @@ export const unqualifiedToQualifiedNote = [
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "事务ID", prop: "tenantId" },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 采购上架记录 已调整 20221220

From 04cbc4b751ee67d4effba6379882e48c9ad628eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 7 Apr 2023 13:46:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=BD=E5=B1=89=E7=AA=9C=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/components/commonTabel-drawer/index.vue        | 1 -
 fe/PC/src/components/commonTabel-drawer/style/index.scss | 5 ++++-
 fe/PC/src/styles/basicData.scss                          | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fe/PC/src/components/commonTabel-drawer/index.vue b/fe/PC/src/components/commonTabel-drawer/index.vue
index c1029a1cd..b06b0e292 100644
--- a/fe/PC/src/components/commonTabel-drawer/index.vue
+++ b/fe/PC/src/components/commonTabel-drawer/index.vue
@@ -8,7 +8,6 @@
     :with-header="false"
     :modal="false"
     size="100%"
-    style="height:calc(100% - 28px);top: 14px;right:14px"
   >
     <div class="drawer-heder">
       <div class="heder-left">
diff --git a/fe/PC/src/components/commonTabel-drawer/style/index.scss b/fe/PC/src/components/commonTabel-drawer/style/index.scss
index bdd3e882e..877fd49f9 100644
--- a/fe/PC/src/components/commonTabel-drawer/style/index.scss
+++ b/fe/PC/src/components/commonTabel-drawer/style/index.scss
@@ -3,6 +3,9 @@
   position: absolute;
   left: 32%;
   overflow: visible;
+  // height:calc(100% - 28px);
+  // top: 14px;
+  // right:14px
 
   ::v-deep .el-drawer {
     height: 100%;
@@ -67,7 +70,7 @@
           display: flex;
           flex-direction: column;
           .el-tabs__header{
-            padding-bottom: 5px ;
+            // padding-bottom: 5px ;
             .el-tabs__nav{
                 z-index: auto !important;
             }
diff --git a/fe/PC/src/styles/basicData.scss b/fe/PC/src/styles/basicData.scss
index 1dc5e3451..231d5cd5d 100644
--- a/fe/PC/src/styles/basicData.scss
+++ b/fe/PC/src/styles/basicData.scss
@@ -2,6 +2,7 @@
 .page-box {
   @include appMainPage;
   padding-top:20px;
+  position: relative;
 
   ::v-deep .v-modal {
     z-index: 20 !important;