chencc 1 rok temu
rodzic
commit
00bf971ef1

+ 1 - 0
src/api/system/organization/index.js

@@ -28,6 +28,7 @@ export async function getById(params) {
  * @param params 查询条件
  * @param params 查询条件
  */
  */
 export async function getUserPage(params) {
 export async function getUserPage(params) {
+  // 将参数转换为URLSearchParams对象
   let par = new URLSearchParams(params);
   let par = new URLSearchParams(params);
   const res = await request.get(`/main/user/getUserPage?` + par, {});
   const res = await request.get(`/main/user/getUserPage?` + par, {});
   if (res.data.code == 0) {
   if (res.data.code == 0) {

+ 3 - 2
src/views/material/BOMmanage/detailsPop.vue

@@ -463,6 +463,8 @@
 
 
         this.getTreeData();
         this.getTreeData();
         this.getVersion();
         this.getVersion();
+
+
       },
       },
 
 
       handleClose() {
       handleClose() {
@@ -530,8 +532,6 @@
         if (id) {
         if (id) {
           getBomGetById(id).then((res) => {
           getBomGetById(id).then((res) => {
 
 
-            console.log(res,'res33333333333333333');
-
             res.data.attributeType = res.data.category.attributeType;
             res.data.attributeType = res.data.category.attributeType;
 
 
             this.currentNodeData = res.data;
             this.currentNodeData = res.data;
@@ -624,6 +624,7 @@
             this.$message.success('转换成功');
             this.$message.success('转换成功');
 
 
             this.currentNodeData.bomType = _type;
             this.currentNodeData.bomType = _type;
+            this.searchObj.versions = '';
             this.getTreeData();
             this.getTreeData();
             this.getVersion();
             this.getVersion();
           }
           }

+ 10 - 1
src/views/material/BOMmanage/index.vue

@@ -11,7 +11,6 @@
         <el-tab-pane label="PBOM" name="1"> </el-tab-pane>
         <el-tab-pane label="PBOM" name="1"> </el-tab-pane>
         <el-tab-pane label="MBOM" name="2"> </el-tab-pane>
         <el-tab-pane label="MBOM" name="2"> </el-tab-pane>
         <el-tab-pane label="ABOM" name="3"> </el-tab-pane>
         <el-tab-pane label="ABOM" name="3"> </el-tab-pane>
-
         <ele-pro-table
         <ele-pro-table
           ref="table"
           ref="table"
           :columns="columns"
           :columns="columns"
@@ -133,6 +132,16 @@
             label: '名称',
             label: '名称',
             showOverflowTooltip: true
             showOverflowTooltip: true
           },
           },
+          {
+            prop: 'specification',
+            label: '规格',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'modelType',
+            label: '型号',
+            showOverflowTooltip: true
+          },
           {
           {
             prop: 'versions',
             prop: 'versions',
             slot: 'versions',
             slot: 'versions',

+ 1 - 1
src/views/workforceManagement/team/components/staffSelection.vue

@@ -227,7 +227,7 @@
         pageNum: 1,
         pageNum: 1,
         size: this.size,
         size: this.size,
         groupId: this.form.groupId,
         groupId: this.form.groupId,
-        hasAccount:this.hasAccount
+        // hasAccount:this.hasAccount
       };
       };
       this.getStaffList(params);
       this.getStaffList(params);
     },
     },