From fa726fa03e9b00ec9228718f67958415f430f0ac Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Wed, 25 Sep 2024 15:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AEBU=E4=BF=AE=E6=94=B9=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com_projectInfo-add-or-update.vue         | 16 ------
 .../projectInfo/com_project_info_part.vue     | 54 ++++++++++++++++++-
 .../project/projectInfo/projectInfo.vue       | 21 +++-----
 src/views/modules/sys/user.vue                |  7 ---
 4 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index 8d140e5..56a7b3a 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -13,13 +13,6 @@
               <el-input v-model="dataForm.projectId" disabled ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item prop="buDesc" :rules="projectRole.buDesc">
-              <span slot="label" style="" @click="getBaseList(106,1)"><a herf="#">BU</a></span>
-<!--              <el-input v-model="dataForm.buDesc" readonly @focus="getBaseList(106,1)"></el-input>-->
-              <el-input v-model="dataForm.buDesc" readonly ></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="项目名称" prop="projectName">
               <el-input v-model="dataForm.projectName" ></el-input>
@@ -296,8 +289,6 @@
           projectManagerList:[],
           projectOwnerList:[],
           userRoleList:[],
-          buNo:[],
-          buDesc:[],
         },
         userRoleForm:{
           username:'',
@@ -328,13 +319,6 @@
               trigger: ['change','blur']
             }
           ],
-          buDesc: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
           needDate: [
             {
               required: true,
diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue
index 964a2a0..bca77d7 100644
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@@ -85,6 +85,10 @@
         <el-form-item label="客户料号" prop="customerPartNo" :rules="rules.customerPartNo">
           <el-input v-model="modalData.customerPartNo" :disabled="modalData.flag === '2'" clearable style="width: 140px"></el-input>
         </el-form-item>
+        <el-form-item prop="buDesc" :rules="rules.buDesc">
+          <span slot="label" style="" @click="getBaseList(106,1)"><a herf="#">BU</a></span>
+          <el-input v-model="modalData.buDesc" readonly ></el-input>
+        </el-form-item>
         <el-tabs v-model="inventoryPartTable" style="width: 100%;height: 465px;" type="border-card" @tab-click="inventoryPartClick">
           <el-tab-pane label="General" name="General">
             <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
@@ -810,6 +814,38 @@
             fixed: '',
             columnWidth: 300
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table4TestPartNo',
+            tableId: "101002001Table4",
+            tableName: "项目物料",
+            columnProp: "buNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "BU",
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table4PartDesc',
+            tableId: "101002001Table4",
+            tableName: "项目物料",
+            columnProp: "buDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "BU Desc",
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+            columnWidth: 300
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 101002001,
@@ -1342,6 +1378,8 @@
           density: '',
           variableLeadTimeHour: '',
           customerNo: '',
+          buNo: '',
+          buDesc: '',
         },
         modalFlag: false,
         modalDisableFlag: false,
@@ -1423,6 +1461,13 @@
               trigger: ['blur','change']
             }
           ],
+          buDesc: [
+            {
+              required: true,
+              message: ' ',
+              trigger: ['blur','change']
+            }
+          ],
         },
         inventoryPartTable: 'General',
         tempCodeNo: '',
@@ -1541,6 +1586,8 @@
           let strVal = ''
           if (val === 1007) {
             strVal = this.modalData.umId
+          } else if (val === 106) {
+            strVal = this.modalData.buNo;
           } else if (val === 108) {
             strVal = this.modalData.familyId
           } else if (val === 109) {
@@ -1587,6 +1634,9 @@
         if (this.tagNo === 1007) {
           this.modalData.umId = val.um_id
           this.modalData.umName = val.um_name
+        } else if (this.tagNo === 106) {
+          this.modalData.buNo = val.Bu_no;
+          this.modalData.buDesc = val.Bu_desc;
         } else if (this.tagNo === 108) {
           this.modalData.familyId = val.family_id
           this.modalData.familyName = val.family_name
@@ -1782,7 +1832,9 @@
               density: 0,
               variableLeadTimeHour: 0,
               customerNo: this.searchData.customerId,
-              partNoSource: '料号新增'
+              partNoSource: '料号新增',
+              buNo: '',
+              buDesc: '',
             }
             this.modalFlag = true
             this.modalDisableFlag = false
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index 1164a20..e5c1a45 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -111,17 +111,14 @@
           </el-row>
 
           <el-row :gutter="20">
-            <el-col :span="5"><div class="grid-content bg-purple">
-              <el-form-item :label="'BU'">
-                <el-input v-model="projectData.buDesc" readonly style="" ></el-input>
-              </el-form-item>
-            </div></el-col>
-            <el-col :span="5"><div class="grid-content bg-purple">
-              <el-form-item :label="'项目名称'">
-                <el-input v-model="projectData.projectName" readonly style="" ></el-input>
-              </el-form-item>
-            </div></el-col>
-            <el-col :span="14"><div class="grid-content bg-purple">
+            <el-col :span="5">
+              <div class="grid-content bg-purple">
+                <el-form-item :label="'项目名称'">
+                  <el-input v-model="projectData.projectName" readonly style="" ></el-input>
+                </el-form-item>
+              </div>
+            </el-col>
+            <el-col :span="19"><div class="grid-content bg-purple">
               <el-form-item :label="'项目描述'">
                 <el-input v-model="projectData.projectDesc" readonly style="" ></el-input>
               </el-form-item>
@@ -1124,8 +1121,6 @@
           customerRemark:'',
           remark:'',
           userRoleName:'',
-          buDesc:'',
-          buNo:'',
         },
         customerData:{
           site: '',
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 55c4b64..55df0dc 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -205,13 +205,6 @@
                 min-width="50"
                 label="工厂编码">
               </el-table-column>
-              <el-table-column
-                prop="buDesc"
-                header-align="center"
-                align="center"
-                min-width="100"
-                label="部门名称">
-              </el-table-column>
               <el-table-column
                 prop="projectId"
                 header-align="center"