优化样式

src/api/material/jgBom.js

@@ -12,7 +12,7 @@ export async function bomCategoryTemp(params) {
   
 
   // 查询BOM树
-export async function getBomTreeList(params) {
+export async function getBomTreeListTemp(params) {
     const res = await request.get(`/main/bomCategoryTemp/getList`, { params });
     if (res.data.code == 0) {
       return res.data;
@@ -76,7 +76,7 @@ export async function getBomPageCategoryTempId(params) {
 
 
   // 新增BOM树节点
-export async function saveBomTreeList(data) {
+export async function saveBomTreeListTemp(data) {
     const res = await request.post(`/main/bomCategoryTemp/save`, data);
     if (res.data.code == 0) {
       return res.data;

src/components/material/user-search.vue

@@ -45,7 +45,7 @@
       <el-col v-bind="styleResponsive ? { md: 6 } : { span: 4 }">
         <el-form-item>
           <el-button
-            size="small"
+             size="mini"
             type="primary"
             icon="el-icon-search"
             class="ele-btn-icon"
@@ -58,17 +58,17 @@
             @click="reset"
             icon="el-icon-refresh"
             class="ele-btn-icon"
-            size="medium"
+            size="mini"
             >重置</el-button
           >
-
+<!-- 
           <el-button
             type="primary"
             icon="el-icon-refresh-left"
             class="ele-btn-icon"
             @click='refreshData'
             :loading="loading"
-          >刷新</el-button>
+          >刷新</el-button> -->
 
           <slot></slot>
         </el-form-item>

src/views/classifyManage/treeClassify/details.vue

@@ -274,7 +274,7 @@
   }
 
   .sys-organization-list :deep(.el-tree-node__content) {
-    height: 40px;
+    height: 30px;
 
     & > .el-tree-node__expand-icon {
       margin-left: 10px;

src/views/codeManagement/businessCode/index.vue

@@ -220,7 +220,7 @@ export default {
   overflow: auto;
 }
 .sys-organization-list :deep(.el-tree-node__content) {
-  height: 40px;
+  height: 30px;
 
   & > .el-tree-node__expand-icon {
     margin-left: 10px;

src/views/codeManagement/index.vue

@@ -139,7 +139,7 @@
   }
 
   .sys-organization-list :deep(.el-tree-node__content) {
-    height: 40px;
+    height: 30px;
 
     & > .el-tree-node__expand-icon {
       margin-left: 10px;

src/views/enterpriseModel/dept/index.vue

@@ -288,7 +288,7 @@ export default {
 }
 
 .sys-organization-list :deep(.el-tree-node__content) {
-  height: 40px;
+  height: 30px;
 
   & > .el-tree-node__expand-icon {
     margin-left: 10px;

src/views/enterpriseModel/regionalManage/index.vue

@@ -279,7 +279,7 @@ export default {
 }
 
 .sys-organization-list :deep(.el-tree-node__content) {
-  height: 40px;
+  height: 30px;
 
   & > .el-tree-node__expand-icon {
     margin-left: 10px;

src/views/material/BOMmanage/JGDetails.vue

@@ -184,7 +184,7 @@
         </template>
       </ele-split-layout>
     </el-card>
-    <bomTreeDialog ref="bomTreeDialogRef" @reload="bomTreeDialogReload" />
+    <bomTreeDialog :isJgBom="true" ref="bomTreeDialogRef" @reload="bomTreeDialogReload" />
 
     <importDialog
       :defModule="moudleName"
@@ -196,7 +196,7 @@
 
 <script>
   import {
-    getBomTreeList,
+    getBomTreeListTemp,
     getBomGetById,
     convert,
     convertABom,
@@ -371,7 +371,7 @@
       async getTreeData() {
         try {
           this.treeLoading = true;
-          const res = await getBomTreeList({
+          const res = await getBomTreeListTemp({
             categoryId: this.categoryId,
             versions: this.versions,
             bomType: this.currentNodeData.bomType
@@ -495,10 +495,10 @@
   }
 
   .sys-organization-list :deep(.el-tree-node__content) {
-    height: 40px;
+    height: 30px;
 
     & > .el-tree-node__expand-icon {
-      margin-left: 10px;
+      margin-left: 4px;
     }
   }
 
@@ -515,4 +515,6 @@
       text-align: right;
     }
   }
+
+
 </style>

src/views/material/BOMmanage/components/bomTreeDialog.vue

@@ -176,6 +176,7 @@
 
 <script>
   import { getBomTreeList, saveBomTreeList } from '@/api/material/BOM.js';
+  import { getBomTreeListTemp, saveBomTreeListTemp } from '@/api/material/jgBom';
   import selectTree from '@/components/selectTree';
 
   import userSearch from './user-search.vue';
@@ -186,6 +187,13 @@
       selectTree,
       standardOutput
     },
+
+    props: {
+      isJgBom: {
+        type: Boolean,
+        default: false
+      }
+    },
     data() {
       return {
         visible: false,
@@ -256,7 +264,8 @@
             this.attributeData.level = 1;
           }
           this.attributeData.category = this.category;
-          saveBomTreeList(this.attributeData).then((res) => {
+          let ULR = this.isJgBom ? saveBomTreeListTemp : saveBomTreeList;
+          ULR(this.attributeData).then((res) => {
             if (res.code == '0') {
               this.$message.success('保存成功');
               this.$emit('reload', this.attributeData.versions);
@@ -289,13 +298,13 @@
         this.attributeData.versions = versions;
         this.versions = versions;
 
-        console.log(treeId);
-        const res = await getBomTreeList({
+        let  ULR = this.isJgBom ? getBomTreeListTemp : getBomTreeList;
+        const res = await ULR({
           categoryId,
           versions,
           bomType: type
         });
-        console.log(this.attributeData);
+
         this.bomTreeList = res.data;
         this.attributeData.parentId = treeId;
         this.$forceUpdate();

src/views/material/BOMmanage/components/detailedList.vue

@@ -113,12 +113,17 @@
           },
 
           {
-            prop: '',
+            prop: 'materielDesignation',
+            label: '物料代号'
+          },
+
+          {
+            prop: 'supplierName',
             label: '供应商'
           },
 
           {
-            prop: '',
+            prop: 'factories',
             label: '生产厂家'
           },
 

src/views/material/BOMmanage/details.vue

@@ -496,10 +496,10 @@
   }
 
   .sys-organization-list :deep(.el-tree-node__content) {
-    height: 40px;
+    height: 30px;
 
     & > .el-tree-node__expand-icon {
-      margin-left: 10px;
+      margin-left: 4px;
     }
   }
 

src/views/material/BOMmanage/qualityTesting/inspectionClassify/index.vue

@@ -309,7 +309,7 @@
   }
 
   .sys-organization-list :deep(.el-tree-node__content) {
-    height: 40px;
+    height: 30px;
 
     & > .el-tree-node__expand-icon {
       margin-left: 10px;

src/views/material/product/components/CategoryDialog.vue

@@ -151,7 +151,7 @@ export default {
 }
 
 .sys-organization-list :deep(.el-tree-node__content) {
-  height: 40px;
+  height: 30px;
 
   &>.el-tree-node__expand-icon {
     margin-left: 10px;

src/views/material/product/components/index-search.vue

@@ -56,7 +56,7 @@
       <el-col v-bind="styleResponsive ? { md: 24} : { span: 24 }" style="display: flex;justify-content: flex-end">
         <el-form-item>
           <el-button
-            size="small"
+            size="mini"
             type="primary"
             icon="el-icon-search"
             class="ele-btn-icon"
@@ -69,17 +69,17 @@
             @click="reset"
             icon="el-icon-refresh"
             class="ele-btn-icon"
-            size="medium"
+            size="mini"
           >重置</el-button
           >
 
-          <el-button
+          <!-- <el-button
             type="primary"
             icon="el-icon-refresh-left"
             class="ele-btn-icon"
             @click='refreshData'
             :loading="loading"
-          >刷新</el-button>
+          >刷新</el-button> -->
 
           <slot></slot>
         </el-form-item>

src/views/material/product/index.vue

@@ -222,7 +222,7 @@ export default {
 }
 
 .sys-organization-list :deep(.el-tree-node__content) {
-  height: 40px;
+  height: 30px;
 
   &>.el-tree-node__expand-icon {
     margin-left: 10px;

src/views/material/product/oneProduct.vue

@@ -222,7 +222,7 @@
   }
   
   .sys-organization-list :deep(.el-tree-node__content) {
-    height: 40px;
+    height: 30px;
   
     &>.el-tree-node__expand-icon {
       margin-left: 10px;

src/views/system/organization/index.vue

@@ -186,7 +186,7 @@ export default {
 }
 
 .sys-organization-list :deep(.el-tree-node__content) {
-  height: 40px;
+  height: 30px;
 
   & > .el-tree-node__expand-icon {
     margin-left: 10px;