From cf8139357ce616bb297ee77d8f56854d827262d3 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Fri, 15 Nov 2024 15:48:54 +0800
Subject: [PATCH] =?UTF-8?q?2024.11.14=20=E9=80=9A=E7=9F=A5=E6=B5=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/auth/authGroup.vue          |  7 ++-
 src/views/modules/auth/authRule.vue           | 29 ++++++----
 .../modules/part/partCostInformation.vue      | 54 ++++++++++++-------
 3 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/src/views/modules/auth/authGroup.vue b/src/views/modules/auth/authGroup.vue
index 086317e..679adb7 100644
--- a/src/views/modules/auth/authGroup.vue
+++ b/src/views/modules/auth/authGroup.vue
@@ -139,7 +139,7 @@
     </el-dialog>
 
     <!--  新增用户角色  -->
-    <el-dialog title="审批组操作" :close-on-click-modal="false" v-drag :visible.sync="authGroupMemberSaveDialog" width="900px">
+    <el-dialog title="审批组操作" :close-on-click-modal="false" v-drag @close="closeAuthGroupMemberSaveDialogFlag" :visible.sync="authGroupMemberSaveDialog" width="900px">
       <div style="font-size: 12px">
         <el-form :inline="true" label-position="top" :model="searchAuthBusinessData">
           <el-form-item :label="'用户名'">
@@ -903,6 +903,11 @@ export default {
         }
       })
     },
+    closeAuthGroupMemberSaveDialogFlag () {
+      this.authGroupMemberSaveDialog = false
+      this.allAuthBusinessList = []
+      this.isAuthBusinessList = []
+    },
     // 动态列开始 获取 用户保存的 格式列
     async getTableUserColumn(tableId, columnId) {
       let queryTableUser = {
diff --git a/src/views/modules/auth/authRule.vue b/src/views/modules/auth/authRule.vue
index 443d736..0855c51 100644
--- a/src/views/modules/auth/authRule.vue
+++ b/src/views/modules/auth/authRule.vue
@@ -67,8 +67,23 @@
         :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.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          <div v-if="item.columnProp === 'active'">
+            <div v-if="scope.row[item.columnProp] === 'Y'">
+              <span v-if="!item.columnHidden">{{'启用'}}</span>
+              <span v-if="item.columnImage"><img :src="'启用'"
+                                                 style="width: 100px; height: 80px"/></span>
+            </div>
+            <div v-if="scope.row[item.columnProp] === 'N'">
+              <span v-if="!item.columnHidden">{{'禁用'}}</span>
+              <span v-if="item.columnImage"><img :src="'禁用'"
+                                                 style="width: 100px; height: 80px"/></span>
+            </div>
+          </div>
+          <div v-else>
+            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -1135,14 +1150,6 @@ export default {
           this.pageIndex = data.page.currPage
           this.pageSize = data.page.pageSize
           this.totalPage = data.page.totalCount
-          // 遍历数据列表，将状态转换为中文
-          this.dataList.forEach(item => {
-            if (item.active === 'Y') {
-              item.active = '启用'
-            } else {
-              item.active = '禁用'
-            }
-          })
           // 判断是否全部存在数据
           if (this.totalPage > 0) {
             // 设置选中行
@@ -1229,6 +1236,7 @@ export default {
      * @param row
      */
     updateModal (row) {
+      console.log(row.active)
       this.modalData = {
         flag: '2',
         title: '审批规则编辑',
@@ -1293,6 +1301,7 @@ export default {
      * 审批规则信息新增/编辑
      */
     saveData () {
+      console.log(this.modalData)
       if (this.modalData.bu === '' || this.modalData.bu == null) {
         this.$message.warning('请选择BU！')
         return
diff --git a/src/views/modules/part/partCostInformation.vue b/src/views/modules/part/partCostInformation.vue
index b9708dc..ec69da1 100644
--- a/src/views/modules/part/partCostInformation.vue
+++ b/src/views/modules/part/partCostInformation.vue
@@ -89,7 +89,7 @@
                 <el-input v-model="modalData.familyName" disabled style="width: 330px"></el-input>
               </el-form-item>
               <el-form-item label="计量单位">
-                <el-input v-model="modalData.umId" disabled style="width: 80px"></el-input>
+                <el-input v-model="modalData.umId2" disabled style="width: 80px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
@@ -206,7 +206,7 @@ export default {
         sourceBu: '',
         partNo: '',
         partDesc: '',
-        umId: '',
+        umId2: '',
         umName: '',
         familyId: '',
         familyName: '',
@@ -285,28 +285,46 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 6010011,
-          serialNumber: '6010011Table1UmId',
+          serialNumber: '6010011Table1UmId2',
           tableId: '6010011Table1',
           tableName: '物料成本表',
-          columnProp: 'umId',
+          columnProp: 'umId2',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '计量单位',
+          columnLabel: '计量单位编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 6010011,
-          serialNumber: '6010011Table1PartType',
+          serialNumber: '6010011Table1UmName',
           tableId: '6010011Table1',
           tableName: '物料成本表',
-          columnProp: 'partType',
+          columnProp: 'umName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '计量单位名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6010011,
+          serialNumber: '6010011Table1PartType2Desc',
+          tableId: '6010011Table1',
+          tableName: '物料成本表',
+          columnProp: 'partType2Desc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '零件类型',
@@ -316,7 +334,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 150
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
@@ -357,10 +375,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 6010011,
-          serialNumber: '6010011Table1OtherGroup1',
+          serialNumber: '6010011Table1ProductGroupId1',
           tableId: '6010011Table1',
           tableName: '物料成本表',
-          columnProp: 'otherGroup1',
+          columnProp: 'productGroupId1',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '商品组1编码',
@@ -375,20 +393,20 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 6010011,
-          serialNumber: '6010011Table1OtherGroupName1',
+          serialNumber: '6010011Table1ProductGroupName1',
           tableId: '6010011Table1',
           tableName: '物料成本表',
-          columnProp: 'otherGroupName1',
+          columnProp: 'productGroupName1',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: '商品组1描述',
+          align: 'left',
+          columnLabel: '商品组1名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100
+          columnWidth: 150
         },
         {
           userId: this.$store.state.user.name,
@@ -817,7 +835,7 @@ export default {
         buDesc: row.buDesc,
         partNo: row.partNo,
         partDesc: row.partDesc,
-        umId: row.umId,
+        umId2: row.umId2,
         umName: row.umName,
         familyId: row.familyId,
         familyName: row.familyName,
@@ -910,7 +928,7 @@ export default {
         buNo: '',
         partNo: '',
         partDesc: '',
-        umId: '',
+        umId2: '',
         umName: '',
         familyId: '',
         familyName: '',