From aa9e910da7e53a6f0263a16e6913cd65967b5f3a Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 20 Aug 2021 17:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E4=BF=AE=E6=94=B9-sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/auditManagement/auditRules.vue    |  2 +-
 .../modules/auditManagement/auditTeam.vue     |  2 +-
 .../modules/auditManagement/auditType.vue     |  2 +-
 src/views/modules/factory/tblbasedata.vue     | 24 ++++++++++---------
 src/views/modules/knifemold/tool-info.vue     |  2 +-
 .../purchaseorder/procurementReview.vue       |  2 +-
 src/views/modules/report/reportList.vue       |  2 +-
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/auditManagement/auditRules.vue b/src/views/modules/auditManagement/auditRules.vue
index facda85..eac7e43 100644
--- a/src/views/modules/auditManagement/auditRules.vue
+++ b/src/views/modules/auditManagement/auditRules.vue
@@ -1165,7 +1165,7 @@ import {
           languageCode:this.$i18n.locale
         }
         userFavoriteList(userFavorite).then(({data}) =>{
-          let size = data.list.filter(item => item.userId==userFavorite.menuId).length;
+          let size = data.list.filter(item => item.menuId==this.$route.meta.menuId).length;
           if (size>0){
             this.favorite = true
           }else {
diff --git a/src/views/modules/auditManagement/auditTeam.vue b/src/views/modules/auditManagement/auditTeam.vue
index 1ff90cf..20be4c8 100644
--- a/src/views/modules/auditManagement/auditTeam.vue
+++ b/src/views/modules/auditManagement/auditTeam.vue
@@ -774,7 +774,7 @@ import {
           languageCode:this.$i18n.locale
         }
         userFavoriteList(userFavorite).then(({data}) =>{
-          let size = data.list.filter(item => item.userId==userFavorite.menuId).length;
+          let size = data.list.filter(item => item.menuId==this.$route.meta.menuId).length;
           if (size>0){
             this.favorite = true
           }else {
diff --git a/src/views/modules/auditManagement/auditType.vue b/src/views/modules/auditManagement/auditType.vue
index efa6779..72c3beb 100644
--- a/src/views/modules/auditManagement/auditType.vue
+++ b/src/views/modules/auditManagement/auditType.vue
@@ -592,7 +592,7 @@ import {
           languageCode:this.$i18n.locale
         }
         userFavoriteList(userFavorite).then(({data}) =>{
-          let size = data.list.filter(item => item.userId==userFavorite.menuId).length;
+          let size = data.list.filter(item => item.menuId==this.$route.meta.menuId).length;
           if (size>0){
             this.favorite = true
           }else {
diff --git a/src/views/modules/factory/tblbasedata.vue b/src/views/modules/factory/tblbasedata.vue
index 93709a1..6928676 100644
--- a/src/views/modules/factory/tblbasedata.vue
+++ b/src/views/modules/factory/tblbasedata.vue
@@ -33,7 +33,7 @@
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
         :fixed="item.fixed"
-        :width="item.columnWidth"
+        min-width="20%"
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
@@ -41,6 +41,7 @@
                                              style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
+
       <el-table-column
         fixed="right"
         header-align="center"
@@ -111,14 +112,15 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
             tableName: "工厂信息",
             columnProp: "id",
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: "工厂id",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
-            fixed: false
+            fixed: false,
+            columnWidth: 50
           },
           {
             userId: this.$store.state.user.name,
@@ -128,7 +130,7 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
             tableName: "工厂信息",
             columnProp: "site",
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: "site",
             columnHidden: false,
             columnImage: false,
@@ -145,7 +147,7 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
             tableName: "工厂信息",
             columnProp: "sortNo",
             headerAlign: "type",
-            align: "center",
+            align: "left",
             columnLabel: "type",
             columnHidden: false,
             columnImage: false,
@@ -162,7 +164,7 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
             tableName: "工厂信息",
             columnProp: "secondType",
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: "secondType",
             columnHidden: false,
             columnImage: false,
@@ -179,7 +181,7 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
             tableName: "工厂信息",
             columnProp: "baseData",
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: "工厂编号",
             columnHidden: false,
             columnImage: false,
@@ -196,7 +198,7 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
             tableName: "工厂信息",
             columnProp: "baseDesc",
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: "工厂描述",
             columnHidden: false,
             columnImage: false,
@@ -213,7 +215,7 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
             tableName: "工厂信息",
             columnProp: "status",
             headerAlign: "status",
-            align: "center",
+            align: "left",
             columnLabel: "status",
             columnHidden: false,
             columnImage: false,
@@ -230,7 +232,7 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
             tableName: "工厂信息",
             columnProp: "sortNo",
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: "sortNo",
             columnHidden: false,
             columnImage: false,
@@ -247,7 +249,7 @@ import {userFavoriteList,saveUserFavorite,removeUserFavorite} from '@/api/userFa
             tableName: "工厂信息",
             columnProp: "remark",
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: "工厂备注",
             columnHidden: false,
             columnImage: false,
diff --git a/src/views/modules/knifemold/tool-info.vue b/src/views/modules/knifemold/tool-info.vue
index dfa46c1..d994ccf 100644
--- a/src/views/modules/knifemold/tool-info.vue
+++ b/src/views/modules/knifemold/tool-info.vue
@@ -964,7 +964,7 @@
           languageCode:this.$i18n.locale
         }
         userFavoriteList(userFavorite).then(({data}) =>{
-          let size = data.list.filter(item => item.userId==userFavorite.menuId).length;
+          let size = data.list.filter(item => item.menuId==this.$route.meta.menuId).length;
           if (size>0){
             this.favorite = true
           }else {
diff --git a/src/views/modules/purchaseorder/procurementReview.vue b/src/views/modules/purchaseorder/procurementReview.vue
index 32ba290..e9d881b 100644
--- a/src/views/modules/purchaseorder/procurementReview.vue
+++ b/src/views/modules/purchaseorder/procurementReview.vue
@@ -786,7 +786,7 @@
           languageCode:this.$i18n.locale
         }
         userFavoriteList(userFavorite).then(({data}) =>{
-          let size = data.list.filter(item => item.userId==userFavorite.menuId).length;
+          let size = data.list.filter(item => item.menuId==this.$route.meta.menuId).length;
           if (size>0){
             this.favorite = true
           }else {
diff --git a/src/views/modules/report/reportList.vue b/src/views/modules/report/reportList.vue
index dde8fe0..dbf9812 100644
--- a/src/views/modules/report/reportList.vue
+++ b/src/views/modules/report/reportList.vue
@@ -554,7 +554,7 @@ export default {
         languageCode:this.$i18n.locale
       }
       userFavoriteList(userFavorite).then(({data}) =>{
-        let size = data.list.filter(item => item.userId==userFavorite.menuId).length;
+        let size = data.list.filter(item => item.menuId==this.$route.meta.menuId).length;
         if (size>0){
           this.favorite = true
         }else {