记录规则功能修改隐藏关联分类

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

@@ -1647,6 +1647,18 @@
         );
       },
       open(rowData, treeData, tableData, isView, attributeData, resourceBomId) {
+        // 工序信息
+        console.log('rowData', rowData);
+        // bom 信息
+        console.log('treeData', treeData);
+        // 工序信息
+        console.log('tableData', tableData);
+        // 是否为详情 详情只能查看
+        console.log('isView', isView);
+        // bom 信息 和 treeData 一致
+        console.log('attributeData', attributeData);
+        // bom id 对应 treeData和attributeData里的id
+        console.log('resourceBomId', resourceBomId);
         this.columns = [];
         this.columns1 = [];
         this.isView = isView; //true详情 false编辑

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

@@ -254,6 +254,7 @@
       ref="userEdit"
       :typeList="typeList"
     />
+
   </div>
 </template>
 
@@ -283,9 +284,11 @@
       UserEdit
     },
     props: {
+      // bom id
       resourceBomId: String,
-
+      // bom 信息
       taskParam: Object,
+      // bom 信息 和 taskParam是一样的
       attributeData: {
         type: Object,
         default: {}

src/views/material/product/oneProduct.vue

@@ -365,7 +365,7 @@
 <style lang="scss" scoped>
   .sys-organization-list {
     height: calc(100vh - 165px);
-    box-sizing: border-box;
+      x-sizing: border-box;
     border-width: 1px;
     border-style: solid;
     overflow: auto;

src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -799,7 +799,7 @@
         type: '',
         relateProductMethodOpeions: [
           { label: '不关联', value: 0 },
-          { label: '关联分类', value: 1 },
+          // { label: '关联分类', value: 1 },
           { label: '关联产品', value: 2 }
         ],
         // 产品分类

src/views/technology/production/components/user-setting-matter-process-drawer.vue

@@ -50,8 +50,8 @@
       </el-form>
 
       <el-tabs v-model="activeName" type="card">
-        <el-tab-pane label="关联分类" name="category">
-          <!-- 关联分类 -->
+        <!-- 关联分类 -->
+        <!-- <el-tab-pane label="关联分类" name="category">
           <ele-pro-table
             ref="categoryTableRef"
             :columns="categoryColumns"
@@ -74,7 +74,7 @@
               </el-link>
             </template>
           </ele-pro-table>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane label="关联产品" name="product">
           <div style="margin-top: 20px">
             <seekPage :seekList="seekList" @search="reload" />
@@ -100,6 +100,8 @@
           </ele-pro-table>
         </el-tab-pane>
       </el-tabs>
+
+      <workingProcedure ref="workingProcedureRef"></workingProcedure>
     </div>
   </el-drawer>
 </template>
@@ -107,8 +109,12 @@
 <script>
   import { getTreeByPid } from '@/api/classifyManage';
   import { getList } from '@/api/classifyManage/itemInformation.js';
+  import workingProcedure from '@/views/material/BOMmanage/components/workingProcedure.vue';
 
   export default {
+    components: {
+      workingProcedure
+    },
     computed: {
       categoryColumns() {
         return [
@@ -151,8 +157,14 @@
             label: '型号',
             prop: 'modelType'
           },
+          // 下拉
+          {
+            label: 'BOM类型',
+            prop: 'weightUnit'
+          },
+          // 下拉
           {
-            label: '单位',
+            label: 'BOM版本',
             prop: 'weightUnit'
           },
           {
@@ -222,7 +234,7 @@
             label: '生产准备'
           }
         ],
-        activeName: 'category',
+        activeName: 'product',
         // 产品分类
         productCategory: [],
         expandRowKeys: []
@@ -267,7 +279,7 @@
       // 工序配置
       openConfig(row) {
         console.log('row', row);
-        this.$message.warning('工序配置功能待开发');
+        this.$refs.workingProcedureRef.open();
       }
     }
   };

src/views/technology/production/components/user-setting-matter-process.vue

@@ -327,12 +327,11 @@
       // 查询事项数据
       async getMatterList() {
         const { list } = await produceTaskRecordRules({
+          // 工序id
           produceTaskId: this.currentRow.id,
           pageNum: 1,
           size: 9999,
-          reportWorkType: this.reportWorkType,
-          categoryLevels: this.params.categoryLevels,
-          productIds: this.params.products.map((item) => item.id)
+          reportWorkType: this.reportWorkType
         });
         console.log('list', list);
         // 表格数据

vue.config.js

@@ -39,8 +39,8 @@ module.exports = {
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18087',
 
-        // target: 'http://192.168.1.251:18086', // 开发
-        target: 'http://192.168.1.116:18086', // 赵沙金
+        target: 'http://192.168.1.251:18086', // 开发
+        // target: 'http://192.168.1.116:18086', // 赵沙金
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {