From 7cd1e1f9b6cb817b5667c1dcb7ecaaa145f3b30f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 30 May 2024 14:27:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E6=8A=A5=E8=A1=A8=E3=80=91?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=BF=85=E5=A1=AB=E5=8F=8A?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E5=B0=81=E8=A3=85=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/reportPage/index.vue       | 16 +++++++++--
 .../src/components/reportPageHeader/index.vue | 28 +++++++++++++++++--
 .../src/views/report/InventoryJournalERP.vue  | 22 +++++++++++----
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/fe/UI.DY.AgGridReport/src/components/reportPage/index.vue b/fe/UI.DY.AgGridReport/src/components/reportPage/index.vue
index 9ad189ce7..085162d16 100644
--- a/fe/UI.DY.AgGridReport/src/components/reportPage/index.vue
+++ b/fe/UI.DY.AgGridReport/src/components/reportPage/index.vue
@@ -6,6 +6,7 @@
             @columnFliterCallback="columnFliterCallback"
             :searchConfig="searchConfig"
             :searchForm="searchForm"
+            :searchRules="searchRules"
             :reportName="reportName"
             @headerSearchHandle="headerSearchHandle"
             :showReportTitle="showReportTitle"
@@ -52,6 +53,11 @@ export default {
             type: Object,
             default: null
         },
+        // 查询条件必填项
+        searchRules:{
+            type: Object,
+            default:null
+        },
         // 底部汇总配置
         BottomFixedItem:{
             type: Array,
@@ -111,8 +117,14 @@ export default {
                 })
         },
         // 查询事件
-        headerSearchHandle(data){
-            this.getList()
+        headerSearchHandle(data,el){
+            el.validate((valid) => {
+                if (valid) {
+                    this.getList()
+                } else {
+                    return false;
+                }
+            });
         },
         // 更新表格数据
         updateTableData(data){
diff --git a/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue b/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue
index c544980e2..1a291ab2f 100644
--- a/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue
+++ b/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue
@@ -7,6 +7,7 @@
             <!-- 左侧查询 -->
             <div class="headerLeftSearch">
                 <el-form 
+                    ref="headerSearchForm_Ref"
                     v-if="searchConfig && searchConfig.length > 0"
                     :inline="true" 
                     :model="searchForm" 
@@ -33,6 +34,8 @@
                             filterable 
                             :placeholder="'请选择'+item.label"
                             :clearable="!item.noClear"
+                            :loading="item.load"
+                            @visible-change='(isShow)=>{selectTypeVisibleChange(isShow,item)}'
                         >
                             <el-option
                                 v-for="op in item.options"
@@ -48,7 +51,7 @@
                             v-model="searchForm[item.prop]"
                             type="date"
                             placeholder="选择日期"
-                            value-format="yyyyMMdd"
+                            value-format="yyyy-MM-dd"
                         ></el-date-picker>
                     </el-form-item>
                     <el-form-item>
@@ -142,7 +145,7 @@ export default {
             if(!this.searchConfig){return}
             this.searchConfig.forEach(item=>{
                 item.options = []
-                if(item.type == 'select' && item.optionsProc){
+                if(item.type == 'select' && item.optionsProc && !item.initNotLoad){
                     // 物料
                     if(item.optionsProc == 'itemCode'){
                         getItemCodeList().then(res=>{
@@ -226,7 +229,7 @@ export default {
         },
         // 表头查询事件
         searchHandle(){
-            this.$emit("headerSearchHandle",this.searchForm)
+            this.$emit("headerSearchHandle",this.searchForm,this.$refs.headerSearchForm_Ref)
         },
         downloadExcelTitle(){
             let _title = this.reportName
@@ -238,6 +241,25 @@ export default {
                 }
             }
             return _title
+        },
+        // 下拉显隐操作
+        selectTypeVisibleChange(isShow,option){
+            if(!isShow)return
+            if(isShow){
+                if(option.optionsProc == 'itemCode'){
+                    option.load = true
+                    getItemCodeList()
+                        .then(res=>{
+                            option.load = false
+                            option.options = res
+                            option.opL="ItemCode"
+                            option.opV="ItemCode"
+                        })
+                        .catch(err=>{
+                            option.load = false
+                        })
+                }
+            }
         }
     },
 };
diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue
index 0f49338d9..5764788a5 100644
--- a/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue
@@ -3,6 +3,7 @@
     :columnList="columnDefs" 
     :searchConfig="searchConfig"
     :searchForm="searchForm"
+    :searchRules="searchRules"
     :BottomFixedItem="BottomFixedItem"
     :reportName="'库存流水账汇总(储位)'"
     :procName="'Proc_库存流水帐汇总ERP'"
@@ -12,6 +13,7 @@
 <script>
 import reportPage from "@/components/reportPage/index"
 import util from '@/utils/util'
+import dateUtil from '@/utils/dateUtil'
 
 export default {
   name: "InventoryJournalERP",
@@ -26,9 +28,15 @@ export default {
         { field: '物品描述1',  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 } },
+        { field: '出库', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), 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 } },
+        { field: '期初库存', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), 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:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
         {type:'select',prop:'LocationErpCode',label:'ERP储位',optionsProc:'LocationErpCode',options:[]},
         {type:'date',prop:'beginDate',label:'起始'},
         {type:'date',prop:'endDate',label:'截止'},
@@ -36,11 +44,15 @@ export default {
       searchForm:{
         ItemCode:"",
         LocationErpCode:"",
-        beginDate:"",
-        endDate:'',
+        beginDate: dateUtil.getnowDay(),
+        endDate: dateUtil.getnowDay(),
       },
-      BottomFixedItem:[],
+      searchRules:{
+        beginDate: [{ required: true, trigger: "blur",message: "起始时间为必填项" }],
+        endDate: [{ required: true,  trigger: "blur",message: "截止时间为必填项" }],
+      },
+      BottomFixedItem:['入库','出库','当前库存','期初库存','期末库存'],
     };
-  }
+  },
 };
 </script>
\ No newline at end of file