From 96ead6fd6f03859699c664846591993c7890fecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 14 Jan 2025 17:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/AppMain.vue                     |  6 +++---
 .../report/edit/components/ReportProductRowEdit.vue   |  3 +++
 src/views/yh/reportUserProd/index.vue                 | 11 ++++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index a25c562..87253de 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -29,10 +29,10 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
+  height: calc(100vh - 50px);
   width: 100%;
   position: relative;
-  overflow: hidden;
+  overflow: auto;
 }
 
 .fixed-header + .app-main {
@@ -42,7 +42,7 @@ export default {
 .hasTagsView {
   .app-main {
     /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
+    height: calc(100vh - 84px);
   }
 
   .fixed-header + .app-main {
diff --git a/src/views/yh/report/edit/components/ReportProductRowEdit.vue b/src/views/yh/report/edit/components/ReportProductRowEdit.vue
index 96865d2..88e80ef 100644
--- a/src/views/yh/report/edit/components/ReportProductRowEdit.vue
+++ b/src/views/yh/report/edit/components/ReportProductRowEdit.vue
@@ -19,6 +19,9 @@
               <el-radio v-for="(item, index) in dict.type.price_type" :key="index" :label="item.value">{{item.label}}</el-radio>
             </el-radio-group>
           </form-col>
+          <!-- <form-col :span="span" label="表面处理" prop="surface">
+            <el-input v-model="row.surface" placeholder="请输入表面处理" />
+          </form-col> -->
           <form-col :span="span / 2" label="单价">
             {{row.pricePrice | dv}} 元
           </form-col>
diff --git a/src/views/yh/reportUserProd/index.vue b/src/views/yh/reportUserProd/index.vue
index 993ac5e..68790d8 100644
--- a/src/views/yh/reportUserProd/index.vue
+++ b/src/views/yh/reportUserProd/index.vue
@@ -24,6 +24,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="员工编号" prop="userNo">
+        <el-input
+          v-model="queryParams.userNo"
+          placeholder="请输入员工编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="工序名称" prop="priceName">
         <el-input
           v-model="queryParams.priceName"
@@ -239,7 +247,8 @@ export default {
         {key: 'reportDate', visible: true, label: '报表日期', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'deptName', visible: true, label: '部门', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'reportStatus', visible: true, label: '报表状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'userName', visible: true, label: '员工', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'userName', visible: true, label: '员工名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'userNo', visible: true, label: '员工编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'priceName', visible: true, label: '工序', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'priceCode', visible: true, label: '工序代码', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'pricePrice', visible: true, label: '单价', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},