From fa70c6932f6357061ccc6bdd03cf94fb0a8092eb Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 01 十二月 2025 16:21:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue |   89 +++++++++++++++++++++++---------------------
 1 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
index 74d925c..10169ab 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
@@ -227,9 +227,13 @@
       field: 'width',
       title: t('order.width'),
       type: 'date',
-      attrs: {placeholder: '', type: 'date'},
+      attrs: {placeholder: '', type: 'date'}, filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged
     },
-    {field: 'height',  title: t('order.height'), showOverflow: "ellipsis"},
+    {field: 'height',  title: t('order.height'), showOverflow: "ellipsis", filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
     {field: 'quantity', title: t('report.quantityClaimed')},
     {field: 'area', title: t('report.areaClaimed')},
     {field: 'date_of_manufacture',  title: t('ingredientsStock.dateOfManufacture')},
@@ -269,72 +273,71 @@
 </script>
 
 <template>
-  <div class="main-div-customer">
-    <div id="selectForm">
-      <el-row :gutter="0">
+  <div  style="width: 100%;height: 100%">
+    <div class="head">
         <el-date-picker
             v-model="form.date1"
             :start-placeholder="$t('basicData.startDate')"
             :end-placeholder="$t('basicData.endDate')"
             format="YYYY/MM/DD"
-            style="width: 100px"
             type="daterange"
             value-format="YYYY-MM-DD"
         />
         &nbsp;&nbsp;
         <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
-      </el-row>
 
     </div>
-    <vxe-grid
-        ref="xGrid"
-        class="mytable-scrollbar"
-        max-height="100%"
-        v-bind="gridOptions"
+    <div class="main-table">
+      <vxe-grid
+          ref="xGrid"
+          class="mytable-scrollbar"
+          height="100%"
+          v-bind="gridOptions"
 
-    >
-      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
-      <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
-      <template #content="{ row }">
-        <ul class="expand-wrapper">
-          <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
-            <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
-            <span>{{ row[item.field] }}</span>
-          </li>
-        </ul>
-      </template>
+      >
+        <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
+        <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+        <template #content="{ row }">
+          <ul class="expand-wrapper">
+            <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+              <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
+              <span>{{ row[item.field] }}</span>
+            </li>
+          </ul>
+        </template>
 
 
-      <template #num1_filter="{ column, $panel }">
-        <div>
-          <div v-for="(option, index) in column.filters" :key="index">
-            <input v-model="option.data" type="text"
-                   @keyup.enter.native="$panel.confirmFilter()"
-                   @input="changeFilterEvent($event, option, $panel)"/>
+        <template #num1_filter="{ column, $panel }">
+          <div>
+            <div v-for="(option, index) in column.filters" :key="index">
+              <input v-model="option.data" type="text"
+                     @keyup.enter.native="$panel.confirmFilter()"
+                     @input="changeFilterEvent($event, option, $panel)"/>
+            </div>
           </div>
-        </div>
-      </template>
+        </template>
 
-      <template #toolbar_buttons>
-        <vxe-button style="margin-right: 0.5rem"
-                    @click="exportExcel('/report/exportRawMaterialRequisition',
+        <template #toolbar_buttons>
+          <vxe-button style="margin-right: 0.5rem"
+                      @click="exportExcel('/report/exportRawMaterialRequisition',
                                           t('report.rawMaterialRequisition'),
                                           form.date1)">
-          {{t('basicData.export')}}</vxe-button>
-      </template>
+            {{t('basicData.export')}}</vxe-button>
+        </template>
 
-    </vxe-grid>
+      </vxe-grid>
+    </div>
   </div>
 </template>
 
 <style scoped>
-.main-div-customer {
-  width: 99%;
-  height: 100%;
+.head{
+  width: 100%;
+  height: 35px;
 }
 
-#selectForm {
-  width: 60%;
-  text-align: center;
+.main-table{
+  width: 100%;
+  height: calc(100% - 35px);
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0