From 5d57df2b6adf30556f5958505cd46257889d12b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 17 Jul 2024 15:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc+=E6=8A=A5=E8=A1=A8=E3=80=91?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js             |  1 +
 fe/PC/src/utils/tabsDesTions/index.js             |  1 +
 fe/PC/src/views/login/index.vue                   | 15 ---------------
 .../src/views/report/InventoryBalanceERP.vue      |  6 +++---
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 378736a28..f0ff058fa 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1840,6 +1840,7 @@ export const FISDeliverRequest =  [
   },
   { label: "客户代码", prop: "customerCode" },
   { label: "客户地址", prop: 'customerAddressCode' },
+  { label: "车牌号", prop: 'mesTruckNumber' },
   { label: "操作员", prop: 'worker' },
   { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true },
   { label: "发货时间", prop: "deliverTime", type: "dateTime" },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 9beb5641e..b63d01bed 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1181,6 +1181,7 @@ export const FISDeliverRequest = [
   { label: "发货申请单号", prop: "number" },
   { label: "客户代码", prop: "customerCode" },
   { label: "客户地址", prop: 'customerAddressCode' },
+  { label: "车牌号", prop: 'mesTruckNumber' },
   { label: "操作员", prop: 'worker' },
   { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true },
   { label: "发货时间", prop: "deliverTime", type: "dateTime" },
diff --git a/fe/PC/src/views/login/index.vue b/fe/PC/src/views/login/index.vue
index 90e4a209b..8ae84c98d 100644
--- a/fe/PC/src/views/login/index.vue
+++ b/fe/PC/src/views/login/index.vue
@@ -1,7 +1,5 @@
 <template>
   <div class="login-container">
-    <!-- <iframe v-show="false" id="getGrabimageIframe" :src='getGrabimageIframeUrl' style="z-index:200;background:#fff;width:100px;height:100px;position:fixed;left:0"></iframe>
-    <el-button style="z-index:200;position:fixed;left:0;bottom:0;background:#000737;border:none" @click="getBase64">获取base64</el-button> -->
     <img class="loginLogoImg" src="../../../public/login_logo.png" alt="">
     <div class="login-form-wrapper">
       <div class="left"></div>
@@ -94,7 +92,6 @@ export default {
       }
     }
     return {
-      // getGrabimageIframeUrl:localStorage.getItem('grabimageURL'),
       loginForm: {
         grant_type: 'password',
         client_id: 'Auth_App',
@@ -145,23 +142,11 @@ export default {
     } else if (this.loginForm.password === '') {
       this.$refs.password.focus()
     }
-    // window.addEventListener('message', function(event) {
-    //   // if (event.origin === 'http://iframe-domain.com') { // 确保消息来自iframe的域
-    //     var result = event.data; // 接收函数执行结果
-    //     console.log('登录页返回base64',result)
-    //   // }
-    // });
   },
   destroyed () {
     // window.removeEventListener('storage', this.afterQRScan)
   },
   methods: {
-    // getBase64(){
-    //   // 在你的页面中
-    //   this.getGrabimageIframeUrl = localStorage.getItem('grabimageURL') + '?time='+new Date().getTime()
-    //   var iframeWindow = document.getElementById('getGrabimageIframe').contentWindow;
-    //   iframeWindow.postMessage('callMyFunction', '*');
-    // },
     checkCapslock (e) {
       const { key } = e
       this.capsTooltip = key && key.length === 1 && (key >= 'A' && key <= 'Z')
diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue
index 6e66b9244..3e7a48a17 100644
--- a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue
@@ -25,17 +25,17 @@ export default {
         { field: '料号名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
-        { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'ERP储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '库存状态', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '余额汇总', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
       ],
       searchConfig:[
         {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
-        {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]},
+        {type:'select',prop:'LocationErpCode',label:'ERP储位',optionsProc:'LocationErpCode',options:[]},
       ],
       searchForm:{
         ItemCode:"",
-        LocationCode:"",
+        LocationErpCode:"",
       },
       BottomFixedItem:['余额汇总'],
     };