Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

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">

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;
             }

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;

fe/PC/src/utils/detailsTableColumns/index.js

@@ -288,9 +288,9 @@ export const InspectNote =  [
   { label: "异常照片", prop: 'photos' },
   { 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' },
@@ -309,7 +309,7 @@ export const InspectNote =  [
   { label: "AbcClass类别", prop: 'abcClass' },
   { label: "事务ID", prop: "tenantId" },
   { label: "status", prop: 'status' },
-  { label: "masterID", prop: "masterID" },
+  { label: "主表ID", prop: "masterID" },
   { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
   { label: "ID", prop: "id" },
   { label: "其他属性", prop: 'otherPropertyJson' },
@@ -328,11 +328,12 @@ export const InspectNote =  [
   // -----------------------------------------------------------------------
 ]
 
-// 不合格转合格记录 已调整
+// 不合格转合格记录 已调整 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" },
@@ -342,15 +343,15 @@ export const unqualifiedToQualifiedNote = [
   { label: "ERP库位", prop: 'toLocationErpCode' },
   // -----------------------------------------------------------------------
   { label: "转合格单号", prop: "number",width: orderWidth },
-  { label: "发货单号", prop: "asnNumber",width: orderWidth },
+  // { label: "发货单号", prop: "asnNumber",width: orderWidth },
-  { label: "标包单位", prop: 'stdPackUom' },
+  // { label: "标包单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "来源箱码", prop: 'fromPackingCode' },
   { label: "来源批次", prop: 'fromLot' },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "完成时间", prop: 'arriveDate' },
+  { label: "完成时间", prop: 'arriveDate', type: "dateTime" },
-  { label: "生产时间", prop: 'produceDate' },
+  { label: "生产时间", prop: 'produceDate', type: "dateTime" },
-  { label: "过期时间", prop: 'expireDate' },
+  { label: "过期时间", prop: 'expireDate', type: "dateTime" },
   { label: "来源库区", prop: 'fromLocationArea' },
   { label: "目标库区", prop: 'toLocationArea' },
   { label: "来源库位组", prop: 'fromLocationGroup' },
@@ -360,10 +361,18 @@ export const unqualifiedToQualifiedNote = [
   { label: "目标仓库", prop: 'toWarehouseCode' },
   { label: "fromStatus", prop: 'fromStatus' },
   { label: "toStatus", prop: 'toStatus' },
-  { label: "到货单号", prop: 'arriveNoticeNumber',width: orderWidth },
+  // { label: "到货单号", prop: 'arriveNoticeNumber',width: orderWidth },
-  { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
+  // { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
-  { label: "订单号", prop: 'poNumber',width: orderWidth },
+  // { label: "订单号", prop: 'poNumber',width: orderWidth },
-  { label: "供应商代码", prop: 'supplierCode' },
+  // { 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" },
   // -----------------------------------------------------------------------
 ]
@@ -2276,7 +2285,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" },
   // -----------------------------------------------------------------------
 ]
@@ -2328,7 +2337,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" },
   // -----------------------------------------------------------------------
 ]
@@ -2369,7 +2378,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" },
   // -----------------------------------------------------------------------
 ]
@@ -2424,7 +2433,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" },
   // -----------------------------------------------------------------------
 ]
@@ -2464,7 +2473,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" },
   // -----------------------------------------------------------------------
 ]
@@ -2509,7 +2518,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" },
   // -----------------------------------------------------------------------
 ]

fe/PC/src/utils/tableColumns/index.js

@@ -1556,7 +1556,7 @@ export const unqualifiedToQualified = [
   { label: "status", prop: 'status' },
   // -----------------------------------------------------------------------
 ]
-// 不合格转合格记录 已调整
+// 不合格转合格记录 已调整 20230407
 export const unqualifiedToQualifiedNote = [
   {
     label: "转合格单号",
@@ -1569,9 +1569,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" },
   // -----------------------------------------------------------------------
 ]

fe/PC/src/utils/tabsDesTions/index.js

@@ -1057,7 +1057,7 @@ export const InspectNote = [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 不合格转合格记录 已调整 20221220
+// 不合格转合格记录 已调整 20230407
 export const unqualifiedToQualifiedNote = [
   { label: "转合格单号", prop: "number" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -1069,9 +1069,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