From 08e820ffce3f6770b8b1eb1d2ea1c441f951c3f3 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Thu, 25 Aug 2022 11:26:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/qd/src/components/Crud/crud.js                        | 4 ++--
 .../wms/basedata/master/materialParameters/index.vue      | 2 +-
 .../basedata/master/materialParameters/view/CpDialog.vue  | 2 +-
 .../src/views/wms/pdm/produce/worktask/print2Dialog.vue   | 2 +-
 mes/qd/src/views/wms/statistics/hpcQuery/index.vue        | 6 +++++-
 mes/qd/src/views/wms/statistics/ioStorQuery/index.vue     | 8 ++++++--
 mes/qd/src/views/wms/statistics/ivtQuery/index.vue        | 8 ++++++--
 mes/qd/src/views/wms/statistics/ledgerQuery/index.vue     | 6 +++++-
 mes/qd/src/views/wms/statistics/outStorQuery/index.vue    | 8 ++++++--
 mes/qd/src/views/wms/statistics/phySicalQuery/index.vue   | 7 +++++--
 .../src/views/wms/statistics/powderOrderQuery/index.vue   | 6 +++++-
 .../views/wms/statistics/powderProductionQuery/index.vue  | 6 +++++-
 .../src/views/wms/statistics/productionDayQuery/index.vue | 6 +++++-
 mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue   | 6 +++++-
 .../src/views/wms/statistics/sendReceiveQuery/index.vue   | 6 +++++-
 mes/qd/src/views/wms/statistics/stifleQuery/index.vue     | 6 +++++-
 16 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/mes/qd/src/components/Crud/crud.js b/mes/qd/src/components/Crud/crud.js
index 340d7ae6..549d9ca3 100644
--- a/mes/qd/src/components/Crud/crud.js
+++ b/mes/qd/src/components/Crud/crud.js
@@ -56,7 +56,7 @@ function CRUD(options) {
       reset: true
     },
     // 自定义一些扩展属性
-    props: {},
+    props: { size: 10 },
     // 在主页准备
     queryOnPresenterCreated: true,
     // 调试开关
@@ -97,7 +97,7 @@ function CRUD(options) {
       // 页码
       page: 0,
       // 每页数据条数
-      size: 10,
+      size: options.props.size,
       // 总数据条数
       total: 0
     },
diff --git a/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue b/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue
index 073c28ec..74cf6810 100644
--- a/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue
+++ b/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue
@@ -73,7 +73,7 @@
         <el-table-column prop="stock_standard_weight" label="原料标准桶重" width="100px" :formatter="crud.formatNum3"/>
         <el-table-column prop="stock_is_report" label="原料是否生成理化报告" width="150px" :formatter="stockIsReport"/>
         <el-table-column prop="wc_seqno" label="原料碳化钨顺序号" width="120px"/>
-        <el-table-column prop="old_mark" label="原牌号"/>
+        <el-table-column prop="old_mark" label="粉料牌号"/>
         <el-table-column prop="standard_mark" label="标准牌号"/>
         <el-table-column prop="product_mode" label="生产方式" :formatter="formatProductMode"/>
         <el-table-column prop="is_auto_open" label="是否允许自动开单" width="120px" :formatter="isAutoOpen"/>
diff --git a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue
index d7c0b53a..46dcdbc5 100644
--- a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue
+++ b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue
@@ -127,7 +127,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="原牌号">
+          <el-form-item label="粉料牌号">
             <el-input v-model="formData.old_mark" style="width: 200px;" />
           </el-form-item>
         </el-col>
diff --git a/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue b/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue
index a4308f58..1202660f 100644
--- a/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue
+++ b/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue
@@ -145,7 +145,7 @@ export default {
           }
           const LODOP = getLodop()
           LODOP.PRINT_INIT('')
-          LODOP.SET_PRINT_PAGESIZE(1, '150mm', '100mm', '')
+          LODOP.SET_PRINT_PAGESIZE(2, '150mm', '100mm', '')
           LODOP.ADD_PRINT_RECT('2mm', '2mm', '146mm', '96mm', 0, 1)
           LODOP.SET_PRINT_STYLE('FontSize', 23)
           LODOP.SET_PRINT_STYLE('Bold', 1)
diff --git a/mes/qd/src/views/wms/statistics/hpcQuery/index.vue b/mes/qd/src/views/wms/statistics/hpcQuery/index.vue
index b7bfce75..8fba113c 100644
--- a/mes/qd/src/views/wms/statistics/hpcQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/hpcQuery/index.vue
@@ -53,7 +53,7 @@
         v-loading="crud.loading"
         :data="crud.data"
         size="mini"
-        :max-height="420"
+        :max-height="550"
         style="width: 100%;background: transparent;overflow:auto;"
         @selection-change="crud.selectionChangeHandler"
       >
@@ -90,6 +90,10 @@ export default {
       idField: 'performance_id',
       sort: 'performance_id,desc',
       crudMethod: { ... crudHpcQuery },
+      props: {
+        // 每页数据条数
+        size: 20
+      },
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue b/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue
index 8b048cbb..6d39040d 100644
--- a/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue
@@ -188,7 +188,7 @@
         v-loading="crud.loading"
         size="mini"
         :data="crud.data"
-        :max-height="420"
+        :max-height="550"
         style="width: 100%;"
         :highlight-current-row="true"
         @selection-change="crud.selectionChangeHandler"
@@ -243,7 +243,11 @@ export default {
   name: 'IoStorQuery',
   components: { crudOperation, rrOperation, pagination, TaskDialog, DivDialog },
   cruds() {
-    return CRUD({ title: '出入库单报表', idField: 'iostorinv_id', url: 'api/checkoutbill', crudMethod: { ...checkoutbill },
+    return CRUD({ title: '出入库单报表',
+      props: {
+        // 每页数据条数
+        size: 20
+      },idField: 'iostorinv_id', url: 'api/checkoutbill', crudMethod: { ...checkoutbill },
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/statistics/ivtQuery/index.vue b/mes/qd/src/views/wms/statistics/ivtQuery/index.vue
index 1c237a31..6571bdde 100644
--- a/mes/qd/src/views/wms/statistics/ivtQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/ivtQuery/index.vue
@@ -151,14 +151,14 @@
         ref="table"
         v-loading="crud.loading"
         :data="crud.data"
-        :max-height="420"
+        :max-height="550"
         size="mini"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
         <el-table-column prop="stor_name" label="仓库" />
-        <el-table-column prop="sect_name" label="库区" />
+        <el-table-column prop="sect_name" label="库区" min-width="100" />
         <el-table-column prop="struct_code" label="货位编码" width="120" />
         <el-table-column prop="struct_name" label="货位名称" min-width="150" show-overflow-tooltip />
         <el-table-column prop="storagevehicle_code" label="托盘号">
@@ -215,6 +215,10 @@ export default {
       url: 'api/ivtQuery',
       idField: 'point_id',
       sort: 'point_id,desc',
+      props: {
+        // 每页数据条数
+        size: 20
+      },
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue b/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue
index 3a98f9f9..f79f8ec9 100644
--- a/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/ledgerQuery/index.vue
@@ -57,7 +57,7 @@
         ref="table"
         v-loading="crud.loading"
         :data="crud.data"
-        :max-height="420"
+        :max-height="550"
         size="mini"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
@@ -111,6 +111,10 @@ export default {
       url: 'api/purchaseorderproc/ledgerQuery',
       idField: 'id',
       sort: 'id,desc',
+      props: {
+        // 每页数据条数
+        size: 20
+      },
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/statistics/outStorQuery/index.vue b/mes/qd/src/views/wms/statistics/outStorQuery/index.vue
index b9e9de46..7bf5ee3b 100644
--- a/mes/qd/src/views/wms/statistics/outStorQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/outStorQuery/index.vue
@@ -101,7 +101,7 @@
         ref="table"
         v-loading="crud.loading"
         size="mini"
-        :max-height="420"
+        :max-height="550"
         :data="crud.data"
         style="width: 100%;"
         :highlight-current-row="true"
@@ -140,7 +140,11 @@ export default {
   name: 'outStorQuery',
   components: { StructIvt, crudOperation, rrOperation, pagination },
   cruds() {
-    return CRUD({ title: '生产配粉领料', idField: 'iostorinv_id', url: 'api/checkoutbill/queryDtl', crudMethod: { ...checkoutbill },
+    return CRUD({ title: '生产配粉领料',
+      props: {
+        // 每页数据条数
+        size: 20
+      },idField: 'iostorinv_id', url: 'api/checkoutbill/queryDtl', crudMethod: { ...checkoutbill },
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue b/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue
index 9307c811..77bf78fb 100644
--- a/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue
@@ -119,7 +119,7 @@
         ref="table"
         v-loading="crud.loading"
         :data="crud.data"
-        :max-height="420"
+        :max-height="550"
         size="mini"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
@@ -158,6 +158,10 @@ export default {
       idField: 'performance_id',
       sort: 'performance_id,desc',
       crudMethod: { ...crudPhySicalQuery },
+      props: {
+        // 每页数据条数
+        size: 20
+      },
       optShow: {
         add: false,
         edit: false,
@@ -179,7 +183,6 @@ export default {
   beforeCreate() {
   },
   created() {
-
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
diff --git a/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue b/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue
index d9213d63..0b0c5adc 100644
--- a/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue
@@ -68,7 +68,7 @@
       <!--表格渲染-->
       <el-table
         ref="table"
-        :max-height="420"
+        :max-height="550"
         v-loading="crud.loading"
         :data="crud.data"
         size="mini"
@@ -107,6 +107,10 @@ export default {
       idField: 'workorder_id',
       sort: 'workorder_id,desc',
       crudMethod: { ...crudPowderorder },
+      props: {
+        // 每页数据条数
+        size: 20
+      },
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/statistics/powderProductionQuery/index.vue b/mes/qd/src/views/wms/statistics/powderProductionQuery/index.vue
index 84f6d7ec..4adf78ac 100644
--- a/mes/qd/src/views/wms/statistics/powderProductionQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/powderProductionQuery/index.vue
@@ -52,7 +52,7 @@
         v-loading="crud.loading"
         :data="crud.data"
         size="mini"
-        :max-height="420"
+        :max-height="550"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
@@ -98,6 +98,10 @@ export default {
       url: 'api/powderProductionQuery',
       idField: 'workorder_id',
       sort: 'workorder_id,desc',
+      props: {
+        // 每页数据条数
+        size: 20
+      },
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/statistics/productionDayQuery/index.vue b/mes/qd/src/views/wms/statistics/productionDayQuery/index.vue
index fea34ac3..8ab3b312 100644
--- a/mes/qd/src/views/wms/statistics/productionDayQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/productionDayQuery/index.vue
@@ -63,7 +63,7 @@
         v-loading="crud.loading"
         :data="crud.data"
         size="mini"
-        :max-height="420"
+        :max-height="550"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
@@ -101,6 +101,10 @@ export default {
       idField: 'workorder_id',
       sort: 'workorder_id,desc',
       crudMethod: { ...crudProductionday },
+      props: {
+        // 每页数据条数
+        size: 20
+      },
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue b/mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue
index a2d93419..320bde88 100644
--- a/mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue
@@ -92,7 +92,7 @@
         v-loading="crud.loading"
         :data="crud.data"
         size="mini"
-        :max-height="420"
+        :max-height="550"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
@@ -130,6 +130,10 @@ export default {
       idField: 'performance_id',
       sort: 'performance_id,desc',
       crudMethod: { ...crudRawuatwcquery },
+      props: {
+        // 每页数据条数
+        size: 20
+      },
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/statistics/sendReceiveQuery/index.vue b/mes/qd/src/views/wms/statistics/sendReceiveQuery/index.vue
index d8d8d35e..c28acdcb 100644
--- a/mes/qd/src/views/wms/statistics/sendReceiveQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/sendReceiveQuery/index.vue
@@ -81,7 +81,7 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission"/>
       <!--表格渲染-->
-      <el-table ref="table" show-summary :summary-method="getSum" :max-height="420" v-loading="crud.loading" :data="crud.data" size="mini"
+      <el-table ref="table" show-summary :summary-method="getSum" :max-height="550" v-loading="crud.loading" :data="crud.data" size="mini"
                 style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column prop="class_name" label="物料分类"/>
         <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip/>
@@ -149,6 +149,10 @@ export default {
       idField: 'stordaily_id',
       sort: '',
       crudMethod: {...crudIostordaily},
+      props: {
+        // 每页数据条数
+        size: 20
+      },
       optShow: {
         add: false,
         edit: false,
diff --git a/mes/qd/src/views/wms/statistics/stifleQuery/index.vue b/mes/qd/src/views/wms/statistics/stifleQuery/index.vue
index 3e07e7f9..19269ea8 100644
--- a/mes/qd/src/views/wms/statistics/stifleQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/stifleQuery/index.vue
@@ -52,7 +52,7 @@
         ref="table"
         v-loading="crud.loading"
         :data="crud.data"
-        :max-height="420"
+        :max-height="550"
         size="mini"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
@@ -89,6 +89,10 @@ export default {
       idField: 'performance_id',
       sort: 'performance_id,desc',
       crudMethod: { ...crudStifleQuery },
+      props: {
+        // 每页数据条数
+        size: 20
+      },
       optShow: {
         add: false,
         edit: false,