From 87157629c462bd4aa6556fa9f1c6c77517a8642a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 4 Apr 2023 10:06:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E8=AF=B7=E6=B1=82=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-core.js                     |  2 +-
 fe/PC/src/filters/options.js                  |  2 +-
 fe/PC/src/filters/status.js                   |  4 ++--
 fe/PC/src/mixins/TableMixins.js               |  4 ++++
 fe/PC/src/mixins/printMixin.js                |  2 +-
 fe/PC/src/utils/detailsTableColumns/index.js  | 22 +++++++++++++------
 fe/PC/src/utils/tableColumns/index.js         | 14 +++++++-----
 fe/PC/src/utils/tabsDesTions/index.js         | 12 +++++-----
 .../basicData/SupplierManage/Supplier.vue     |  2 +-
 ...tice-ms.vue => PurchaseReceiptRequest.vue} |  5 +++--
 10 files changed, 42 insertions(+), 27 deletions(-)
 rename fe/PC/src/views/rawMaterialManage/purchaseReceipt/{ArriveNotice-ms.vue => PurchaseReceiptRequest.vue} (97%)

diff --git a/fe/PC/src/api/wms-core.js b/fe/PC/src/api/wms-core.js
index ce1e420bb..965aa35c5 100644
--- a/fe/PC/src/api/wms-core.js
+++ b/fe/PC/src/api/wms-core.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // let baseURL = localStorage.getItem('print') + '/api/'
 let baseURL = localStorage.getItem('base') + '/api/'
 
-// 批量获取箱标签信息 | 到货通知
+// 批量获取箱标签信息 | 到货请求
 export function getInventoryLabelByCodes(data) {
   return request({
     url: baseURL + 'label/inventory-label/by-codes',
diff --git a/fe/PC/src/filters/options.js b/fe/PC/src/filters/options.js
index c3c5f518d..9fee56b6f 100644
--- a/fe/PC/src/filters/options.js
+++ b/fe/PC/src/filters/options.js
@@ -179,7 +179,7 @@ export function Roles(val){
     // "PreparationPlan": "备料计划",
     // "ProductReceiptNote": "完工收货记录",
     // "OfflineSettlementNote": "下线结算记录",
-    // "ArriveNotice": "到货通知",
+    // "PurchaseReceiptRequest": "到货请求",
     // "PurchaseReceiptNote": "采购收货记录",
     // "ReceiptAbnormalNote": "收货异常记录",
     // "PurchaseReturnNote": "采购退货记录",
diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index 4a91aaedb..6ad595c34 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -430,9 +430,9 @@ export function calendarStatus(index, prop) {
 }
 /**
  * @param {Boolean} 
- * @returns {object} '到货通知状态'
+ * @returns {object} '到货请求'
  */
-export function arriveNoticeStatus(index, prop) {
+export function PurchaseReceiptRequestStatus(index, prop) {
   let status = {
     1: {
       label: "关闭",
diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js
index 56d45b967..3a00b2674 100644
--- a/fe/PC/src/mixins/TableMixins.js
+++ b/fe/PC/src/mixins/TableMixins.js
@@ -136,6 +136,8 @@ export const tableMixins = {
     },
     // 获取供应商信息过滤tableData
     getSupplierByCodesHandle_table() {
+      this.Loading.tableLoading = false
+      return
       for(let i=0;i<this.tableColumns.length;i++){
         if(this.tableColumns[i].prop == 'supplierName' || this.tableColumns[i].prop == "supplierAddress"){
           let _allSuCode = []
@@ -173,6 +175,8 @@ export const tableMixins = {
     },
     // 获取供应商信息过滤propsData
     getSupplierByCodesHandle_props() {
+      this.Loading.DrawerLoading = false
+      return
       for(let i=0;i<this.tabsDesTions.length;i++){
         if(!this.propsData.supplierCode){
           this.Loading.DrawerLoading = false
diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js
index 2cd2e93da..6b47c491f 100644
--- a/fe/PC/src/mixins/printMixin.js
+++ b/fe/PC/src/mixins/printMixin.js
@@ -93,7 +93,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
 
 // 打印【箱标签-单页4个】 (xiangbq_many.rdlx)
 // 使用位置：半成品上架标签 (PartiallyPreparedProducts.vue) | 生产退库标签 (productionReturnLabel.vue)
-//          | 创建标签 (RecycledMaterialsLabel.vue) | 到货通知详情 (ArriveNotice-ms.vue)
+//          | 创建标签 (RecycledMaterialsLabel.vue) | 到货请求详情 (PurchaseReceiptRequest.vue)
 /**
  * @param {*} propsData 必填 详情数据 示例：this.propsData
  * @param {*} options 自定义特殊配置值 示例：{'number':'poNumber'} (number值将传为poNumber)
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 4dc7ef91d..fe06fd09b 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -67,11 +67,12 @@ export const PurchaseOrder =  [
   { label: "lineStatus", prop: 'lineStatus' },
   // -----------------------------------------------------------------------
 ]
-// 到货通知 已调整
-export const ArriveNotice =  [
+// 到货请求 已调整
+export const PurchaseReceiptRequest =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "发货数量", prop: "qty" },
   { label: "物品单位", prop: "uom" },
   { label: "生产批次", prop: "lot" },
@@ -81,19 +82,26 @@ export const ArriveNotice =  [
   { label: "过期时间", prop: "expireDate", type: "dateTime" },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
-  { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth },
+  { label: "创建者Id", prop: "creatorId" },
+  // { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth },
   { label: "订单号", prop:'poNumber', width: orderWidth },
   // -----------------------------------------------------------------------
+  { label: "单据号", prop:'number', width: orderWidth },
+  { label: "备注", prop:'remark'},
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者Id", prop: "lastModifierId" },
+  // { label: "公司", prop: 'company' },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "仓库", prop: 'warehouseCode' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "订单行", prop: 'poLine' },
   { label: "供应商包装计量单位", prop:'supplierPackUom' },
   { label: "供应商包装数量", prop:'supplierPackQty' },
   { label: "转换率", prop: 'convertRate' },
+  { label: "事务代码", prop: "tenantId" },
+  { label: "id", prop: 'id' },
+  { label: "masterID", prop: '主表ID' },
   // { label: "项目编号", prop: "projectCode" },
   // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
   // -----------------------------------------------------------------------
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 498025eb2..ed2e917ab 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1112,8 +1112,8 @@ export const PurchaseOrder = [
   { label: "orderStatus", prop: 'orderStatus' },
   // -----------------------------------------------------------------------
 ]
-// 到货通知 已调整
-export const ArriveNotice = [
+// 到货请求 已调整 20230404
+export const PurchaseReceiptRequest = [
   {
     label: "到货单号",
     prop: "number",
@@ -1126,16 +1126,18 @@ export const ArriveNotice = [
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName",showProp: true },
   { label: "供应商地址", prop: "supplierAddress",showProp: true },
-  { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
+  { label: "计划到货日期", prop: "planArriveDate", type: "dateTime" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "实际到货日期", prop: "arriveDate ",type: "dateTime" },
+  { label: "请求状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
+  // { label: "实际到货日期", prop: "arriveDate ",type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库", prop: 'warehouseCode' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index fd34e3e66..e6bf9f6b9 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -879,21 +879,21 @@ export const PurchaseOrder =  [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 到货通知 已调整 20221220
-export const ArriveNotice =  [
+// 到货请求 已调整 20230404
+export const PurchaseReceiptRequest =  [
   { label: "到货单号", prop: "number" },
   { label: "订单号", prop: "poNumber" },
   { label: "发货单号", prop: 'asnNumber' },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress" },
-  { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" },
+  { label: "计划到货日期", prop: "planArriveDate",type: "dateTime" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "要货计划单号", prop: 'rpNumber' },
-  { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
+  { label: "请求状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
   { label: "创建者Id", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者Id", prop: "lastModifierId" },
@@ -907,9 +907,9 @@ export const ArriveNotice =  [
   { label: "车牌号", prop: 'truckNumber' },
   { label: "收货口", prop: 'dockCode' },
   { label: "时间窗口", prop: 'timeWindow' },
-  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库", prop: 'warehouseCode' },
   { label: "id", prop: "id" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 采购收货任务 已调整 20221220
diff --git a/fe/PC/src/views/basicData/SupplierManage/Supplier.vue b/fe/PC/src/views/basicData/SupplierManage/Supplier.vue
index 0591e825e..7d718c077 100644
--- a/fe/PC/src/views/basicData/SupplierManage/Supplier.vue
+++ b/fe/PC/src/views/basicData/SupplierManage/Supplier.vue
@@ -222,7 +222,7 @@ export default {
           label: "发货单列表",
           name: 'fhdlb',
           url: 'wms/store/arrive-notice',
-          tableColumns: 'ArriveNotice',
+          tableColumns: 'PurchaseReceiptRequest',
           functionName: 'bySupplierCode'
         },
         {
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue
similarity index 97%
rename from fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue
rename to fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue
index 6fb58bdee..1340ec3ba 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue
@@ -66,7 +66,7 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
 import { mixins } from "@/mixins/mixins";
 import {initPrintPackingCodeManyData } from "@/mixins/printMixin"
 export default {
-  name: "ArriveNotice",
+  name: "PurchaseReceiptRequest",
   mixins: [
     tableMixins,
     LoadingMixins,
@@ -83,7 +83,7 @@ export default {
   },
   data() {
     return {
-      URL: "wms/store/arrive-notice",
+      URL: "wms/store/purchase-receipt-request",
       DrawerButtonData: [
         {
           type: 'info',
@@ -96,6 +96,7 @@ export default {
       ],
       //常用按钮数据
       currenButtonData: [
+        this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选