From 016c1d8da066324a0509e7362187cee5f06b21b6 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 4 Mar 2025 10:38:58 +0800
Subject: [PATCH] =?UTF-8?q?2025-03-04=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/eam/eamFamily.vue            |  2 +-
 src/views/modules/part/agentInformation.vue    | 16 +++++++++++-----
 .../modules/part/manufacturerInformation.vue   | 16 +++++++++++-----
 .../modules/part/partFamilyInformation.vue     | 16 +++++++++++-----
 .../modules/part/partGroupInformation.vue      | 18 ++++++++++++------
 .../part/partProductGroupInformation.vue       | 10 +++++-----
 .../qc/qcSamplingInspectionProgramme.vue       | 11 ++++++++---
 7 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/eam/eamFamily.vue b/src/views/modules/eam/eamFamily.vue
index a1e9129..a3f82f7 100644
--- a/src/views/modules/eam/eamFamily.vue
+++ b/src/views/modules/eam/eamFamily.vue
@@ -200,7 +200,7 @@ export default {
   },
   data () {
     return {
-      columnsProp:['createBy','active','updateBy'],
+      columnsProp:['createBy', 'active', 'updateBy'],
       checked: false,
       itemShow: true,
       refreshTable: true,
diff --git a/src/views/modules/part/agentInformation.vue b/src/views/modules/part/agentInformation.vue
index b89276c..7abd165 100644
--- a/src/views/modules/part/agentInformation.vue
+++ b/src/views/modules/part/agentInformation.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'BU'">
-        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 80px">
           <el-option
             v-for = "i in userBuList"
             :key = "i.buNo"
@@ -15,10 +15,10 @@
         <el-input v-model="searchData.agentId" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'代理商名称'">
-        <el-input v-model="searchData.agentName" clearable style="width: 210px"></el-input>
+        <el-input v-model="searchData.agentName" clearable style="width: 200px"></el-input>
       </el-form-item>
       <el-form-item :label="'是否在用'">
-        <el-select clearable v-model="searchData.active" style="width: 120px">
+        <el-select clearable v-model="searchData.active" style="width: 80px">
           <el-option label="是" value="Y"></el-option>
           <el-option label="否" value="N"></el-option>
         </el-select>
@@ -60,7 +60,12 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="!item.columnHidden">
+            <span v-if="columnsProp.includes(item.columnProp)">{{ scope.row[`${item.columnProp}Desc`] }}</span>
+            <span v-else>
+              {{ scope.row[item.columnProp] }}
+            </span>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -157,6 +162,7 @@ export default {
   },
   data () {
     return {
+      columnsProp:['createBy', 'active', 'updateBy'],
       // 导出
       exportData: [],
       exportName: '代理商' + this.dayjs().format('YYYYMMDDHHmmss'),
diff --git a/src/views/modules/part/manufacturerInformation.vue b/src/views/modules/part/manufacturerInformation.vue
index e0bd524..b3533af 100644
--- a/src/views/modules/part/manufacturerInformation.vue
+++ b/src/views/modules/part/manufacturerInformation.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'BU'">
-        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 80px">
           <el-option
             v-for = "i in userBuList"
             :key = "i.buNo"
@@ -15,10 +15,10 @@
         <el-input v-model="searchData.manufacturerId" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'制造商名称'">
-        <el-input v-model="searchData.manufacturerName" clearable style="width: 210px"></el-input>
+        <el-input v-model="searchData.manufacturerName" clearable style="width: 200px"></el-input>
       </el-form-item>
       <el-form-item :label="'是否在用'">
-        <el-select clearable v-model="searchData.active" style="width: 120px">
+        <el-select clearable v-model="searchData.active" style="width: 80px">
           <el-option label="是" value="Y"></el-option>
           <el-option label="否" value="N"></el-option>
         </el-select>
@@ -60,7 +60,12 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="!item.columnHidden">
+            <span v-if="columnsProp.includes(item.columnProp)">{{ scope.row[`${item.columnProp}Desc`] }}</span>
+            <span v-else>
+              {{ scope.row[item.columnProp] }}
+            </span>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -159,6 +164,7 @@ export default {
   },
   data () {
     return {
+      columnsProp:['createBy', 'active', 'updateBy'],
       // 导出
       exportData: [],
       exportName: '制造商' + this.dayjs().format('YYYYMMDDHHmmss'),
diff --git a/src/views/modules/part/partFamilyInformation.vue b/src/views/modules/part/partFamilyInformation.vue
index 03cbbc8..ff6a597 100644
--- a/src/views/modules/part/partFamilyInformation.vue
+++ b/src/views/modules/part/partFamilyInformation.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'BU'">
-        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 80px">
           <el-option
             v-for = "i in userBuList"
             :key = "i.buNo"
@@ -15,10 +15,10 @@
         <el-input v-model="searchData.familyId" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'分类名称'">
-        <el-input v-model="searchData.familyName" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.familyName" clearable style="width: 200px"></el-input>
       </el-form-item>
       <el-form-item :label="'是否在用'">
-        <el-select clearable v-model="searchData.active" style="width: 120px">
+        <el-select clearable v-model="searchData.active" style="width: 80px">
           <el-option label="是" value="Y"></el-option>
           <el-option label="否" value="N"></el-option>
         </el-select>
@@ -60,7 +60,12 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="!item.columnHidden">
+            <span v-if="columnsProp.includes(item.columnProp)">{{ scope.row[`${item.columnProp}Desc`] }}</span>
+            <span v-else>
+              {{ scope.row[item.columnProp] }}
+            </span>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -159,6 +164,7 @@ export default {
   },
   data () {
     return {
+      columnsProp:['createBy', 'active', 'updateBy'],
       // 导出
       exportData: [],
       exportName: '物料分类' + this.dayjs().format('YYYYMMDDHHmmss'),
diff --git a/src/views/modules/part/partGroupInformation.vue b/src/views/modules/part/partGroupInformation.vue
index 463b976..ae15f51 100644
--- a/src/views/modules/part/partGroupInformation.vue
+++ b/src/views/modules/part/partGroupInformation.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'BU'">
-        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 80px">
           <el-option
             v-for = "i in userBuList"
             :key = "i.buNo"
@@ -15,10 +15,10 @@
         <el-input v-model="searchData.groupId" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'分组名称'">
-        <el-input v-model="searchData.groupName" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.groupName" clearable style="width: 200px"></el-input>
       </el-form-item>
       <el-form-item :label="'是否在用'">
-        <el-select clearable v-model="searchData.active" style="width: 120px">
+        <el-select clearable v-model="searchData.active" style="width: 80px">
           <el-option label="是" value="Y"></el-option>
           <el-option label="否" value="N"></el-option>
         </el-select>
@@ -60,7 +60,12 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="!item.columnHidden">
+            <span v-if="columnsProp.includes(item.columnProp)">{{ scope.row[`${item.columnProp}Desc`] }}</span>
+            <span v-else>
+              {{ scope.row[item.columnProp] }}
+            </span>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -159,6 +164,7 @@ export default {
   },
   data () {
     return {
+      columnsProp:['createBy', 'active', 'updateBy'],
       // 导出
       exportData: [],
       exportName: '物料分组' + this.dayjs().format('YYYYMMDDHHmmss'),
@@ -223,7 +229,7 @@ export default {
           tableName: "分组表",
           columnProp: 'groupName',
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: '分组名称',
           columnHidden: false,
           columnImage: false,
diff --git a/src/views/modules/part/partProductGroupInformation.vue b/src/views/modules/part/partProductGroupInformation.vue
index fef32d4..81b1cb9 100644
--- a/src/views/modules/part/partProductGroupInformation.vue
+++ b/src/views/modules/part/partProductGroupInformation.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+    <el-form :inline="true" label-position="top" :model="searchData">
       <el-form-item :label="'BU'">
-        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">
+        <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 80px">
           <el-option
             v-for = "i in userBuList"
             :key = "i.buNo"
@@ -15,16 +15,16 @@
         <el-input v-model="searchData.productGroupId" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'商品组名称'">
-        <el-input v-model="searchData.productGroupName" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.productGroupName" clearable style="width: 200px"></el-input>
       </el-form-item>
       <el-form-item :label="'是否在用'">
-        <el-select clearable v-model="searchData.active" style="width: 120px">
+        <el-select clearable v-model="searchData.active" style="width: 80px">
           <el-option label="是" value="Y"></el-option>
           <el-option label="否" value="N"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="'商品组'">
-        <el-select clearable v-model="searchData.type" style="width: 120px">
+        <el-select clearable v-model="searchData.type" style="width: 80px">
           <el-option label="商品组1" value="1"></el-option>
           <el-option label="商品组2" value="2"></el-option>
           <el-option label="商品组3" value="3"></el-option>
diff --git a/src/views/modules/qc/qcSamplingInspectionProgramme.vue b/src/views/modules/qc/qcSamplingInspectionProgramme.vue
index c0962d2..4262b10 100644
--- a/src/views/modules/qc/qcSamplingInspectionProgramme.vue
+++ b/src/views/modules/qc/qcSamplingInspectionProgramme.vue
@@ -58,7 +58,12 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden">
+            <span v-if="columnsProp.includes(item.columnProp)">{{ scope.row[`${item.columnProp}Desc`] }}</span>
+            <span v-else>
+              {{ scope.row[item.columnProp] }}
+            </span>
+          </span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -290,7 +295,7 @@
     },
     data () {
       return {
-
+        columnsProp:['createBy', 'updateBy'],
         // 是否收藏
         favorite: false,
         // 导出 start
@@ -683,7 +688,7 @@
 
     mounted () {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 210
+        this.height = window.innerHeight - 180
       })
     },