工序配置配置过程监测功能基本完成

src/api/classifyManage/itemInformation.js

@@ -59,3 +59,12 @@ export async function pageSubstance(params) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// /main/category/getListAndBom
+export async function getListAndBom(body) {
+  const res = await request.post('/main/category/getListAndBom', body);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

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

@@ -410,7 +410,7 @@
           </el-form>
         </el-tab-pane>
 
-        <el-tab-pane label="材料定额" name="材料定额">
+        <el-tab-pane v-if="!process" label="材料定额" name="材料定额">
           <ele-pro-table
             ref="materialTable"
             :columns="columns1"
@@ -578,7 +578,7 @@
           </ele-pro-table>
         </el-tab-pane>
 
-        <el-tab-pane label="制造资源" name="制造资源">
+        <el-tab-pane v-if="!process" label="制造资源" name="制造资源">
           <ele-pro-table
             ref="resourceTable"
             :columns="columns1"
@@ -696,7 +696,7 @@
             </template>
           </ele-pro-table>
         </el-tab-pane>
-        <el-tab-pane label="工艺文件" name="工艺文件">
+        <el-tab-pane v-if="!process" label="工艺文件" name="工艺文件">
           <ele-pro-table
             ref="fileTable"
             :columns="jobColumns1"
@@ -717,7 +717,7 @@
           </ele-pro-table>
         </el-tab-pane>
 
-        <el-tab-pane label="标准产出" name="标准产出">
+        <el-tab-pane v-if="!process" label="标准产出" name="标准产出">
           <ele-pro-table
             ref="standard"
             :columns="standardCol"
@@ -736,6 +736,13 @@
             </template>
           </ele-pro-table>
         </el-tab-pane>
+        <el-tab-pane label="过程监测" name="过程监测">
+          <userSettingMatterProcess
+            :produce-task-id="rowData.id"
+            :produce-task-name="rowData.name"
+            ref="userSettingMatterProcessRef"
+          ></userSettingMatterProcess>
+        </el-tab-pane>
       </el-tabs>
     </el-card>
     <!-- 选择工艺参数 -->
@@ -803,6 +810,7 @@
   import { getBomGetById, getDetailList } from '@/api/material/BOM.js';
   import mbomDatailList from './mbomDatailList.vue';
   import { setFileUrl } from '@/components/addDoc/util.js';
+  import userSettingMatterProcess from '@/views/technology/production/components/user-setting-matter-process.vue';
 
   export default {
     components: {
@@ -817,7 +825,8 @@
       fileIndex,
       fileBrowse,
       replaceMaterialPop,
-      mbomDatailList
+      mbomDatailList,
+      userSettingMatterProcess
     },
     mixins: [dictMixins],
     data() {
@@ -1182,7 +1191,9 @@
         resourceBomId: '',
         level: '',
         attributeData: {},
-        unitList: []
+        unitList: [],
+        // 从工序管理过来为 true tab-pane隐藏 工艺文件、标准产出、材料定额、制造资源
+        process: false
       };
     },
     created() {
@@ -1590,6 +1601,8 @@
           this.$refs.deviceTabRef.setData(
             this.tableData.taskParam[this.currentIndex].standardDevice || []
           );
+        } else if (this.activeName === '过程监测') {
+          // 过程监测数据查询
         }
       },
       openParam(type) {
@@ -1656,12 +1669,20 @@
           dom.getData()
         );
       },
-      open(rowData, treeData, tableData, isView, attributeData, resourceBomId) {
+      open(
+        rowData,
+        treeData,
+        tableData,
+        isView,
+        attributeData,
+        resourceBomId,
+        process = false
+      ) {
         // 工序信息
         console.log('rowData', rowData);
         // bom 信息
         console.log('treeData', treeData);
-        // 工序信息
+        // 工序信息列表 信息 包括工艺参数 材料定额等
         console.log('tableData', tableData);
         // 是否为详情 详情只能查看
         console.log('isView', isView);
@@ -1669,6 +1690,9 @@
         console.log('attributeData', attributeData);
         // bom id 对应 treeData和attributeData里的id
         console.log('resourceBomId', resourceBomId);
+        // 从工序管理过来带有process=true
+        console.log('process', process);
+        this.process = process;
         this.columns = [];
         this.columns1 = [];
         this.isView = isView; //true详情 false编辑
@@ -1716,6 +1740,7 @@
         this.currentIndex = tableData.taskParam.findIndex(
           (item) => item.id === rowData.id
         );
+        console.log('currentIndex', this.currentIndex);
         this.activeName = '工艺参数';
 
         // this.baseCount = rowData.baseCount;
@@ -1734,7 +1759,7 @@
           console.log(this.$refs);
           // 工艺参数
           this.$refs.table.setData(
-            this.tableData.taskParam[this.currentIndex].produceList
+            this.tableData.taskParam[this.currentIndex]?.produceList || []
           );
         }, 500);
 
@@ -1826,6 +1851,10 @@
                 }
               });
               console.log('111112223344', this.tableData.taskParam);
+
+              // 保存过程监测事项
+              this.$refs.userSettingMatterProcessRef?.saveMatterList();
+
               workingProcedureUpdate({
                 id: this.tableData.id,
                 categoryId: this.treeData.categoryId,

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

@@ -87,6 +87,37 @@
             row-key="id"
             cache-key="setting-matter-process-product-table-2510181638"
           >
+            <template v-slot:bomType="{ row }">
+              <el-select
+                v-model="row.bomType"
+                placeholder="请选择"
+                size="small"
+                @change="bomTypeChange(row)"
+              >
+                <el-option
+                  v-for="item in row.bomTypeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </template>
+            <template v-slot:bomVersion="{ row }">
+              <el-select
+                v-model="row.bomVersion"
+                placeholder="请选择"
+                size="small"
+              >
+                <el-option
+                  v-for="item in row.bomCategoryMap[row.bomType] || []"
+                  :key="item.id"
+                  :label="`V${Number(item.versions).toFixed(1)}`"
+                  :value="item.versions"
+                >
+                </el-option>
+              </el-select>
+            </template>
             <template v-slot:action="{ row }">
               <el-link
                 type="primary"
@@ -108,12 +139,15 @@
 
 <script>
   import { getTreeByPid } from '@/api/classifyManage';
-  import { getList } from '@/api/classifyManage/itemInformation.js';
+  import { getListAndBom } from '@/api/classifyManage/itemInformation.js';
   import workingProcedure from '@/views/material/BOMmanage/components/workingProcedure.vue';
+  import userSettingMatterProcess from './user-setting-matter-process.vue';
+  import { getMbomPage } from '@/api/material/BOM.js';
 
   export default {
     components: {
-      workingProcedure
+      workingProcedure,
+      userSettingMatterProcess
     },
     computed: {
       categoryColumns() {
@@ -160,12 +194,14 @@
           // 下拉
           {
             label: 'BOM类型',
-            prop: 'weightUnit'
+            prop: 'bomType',
+            slot: 'bomType'
           },
           // 下拉
           {
             label: 'BOM版本',
-            prop: 'weightUnit'
+            prop: 'bomVersion',
+            slot: 'bomVersion'
           },
           {
             label: '操作',
@@ -261,25 +297,97 @@
         this.drawer = true;
       },
       handleClose(done) {
+        this.$refs.productTableRef.reload();
         done();
       },
       productDatasource({ page, limit, where, order }) {
-        return getList({
+        return this.getList({ page, limit, where, order });
+      },
+      async getList({ page, limit, where, order }) {
+        const data = await getListAndBom({
           ...where,
           ...order,
           pageNum: page,
           size: limit,
-          categoryLevelId: 9
+          categoryLevelId: 9,
+          bomTypes: [1, 2, 3]
+        });
+        data.list.forEach((item) => {
+          item.bomType = '';
+          item.bomVersion = '';
+          item.bomTypeList = Object.keys(item.bomCategoryMap).map((key) => {
+            let label = '';
+            // PBOM = 1,MBOM=2,ABOM=3
+            if (key == '1') {
+              label = 'PBOM';
+            } else if (key == '2') {
+              label = 'MBOM';
+            } else {
+              label = 'ABOM';
+            }
+
+            return {
+              value: key,
+              label: label
+            };
+          });
         });
+        console.log('getList', data);
+        return data;
       },
       /* 刷新表格 */
       reload(where) {
         this.$refs.productTableRef.reload({ page: 1, where: where });
       },
+
+      // bom类型修改
+      bomTypeChange(row) {
+        row.bomVersion = '';
+      },
       // 工序配置
-      openConfig(row) {
+      async openConfig(row) {
         console.log('row', row);
-        this.$refs.workingProcedureRef.open();
+        if (row.bomType && row.bomVersion) {
+          // bom信息查询
+          const bomInfo = row.bomCategoryMap[row.bomType].find(
+            (item) => item.versions == row.bomVersion
+          );
+
+          // 查询工序信息
+          const data = await getMbomPage({
+            pageNum: 1,
+            size: 10,
+            bomCategoryId: bomInfo.id,
+            categoryCode: bomInfo.categoryCode
+          });
+
+          console.log('data', data[0]);
+
+          // 匹配当前工序
+
+          const currentTask = data[0]?.taskParam.find(
+            (item) => item.code == this.currentProcessData.code
+          );
+
+          console.log('currentTask', currentTask, this.currentProcessData.code);
+
+          if (currentTask) {
+            // 打开配置
+            this.$refs.workingProcedureRef.open(
+              currentTask,
+              bomInfo,
+              data[0],
+              false,
+              bomInfo,
+              bomInfo.id,
+              true
+            );
+          } else {
+            this.$message.warning('该BOM下未配置此工序');
+          }
+        } else {
+          this.$message.warning('请先选择BOM类型和版本');
+        }
       }
     }
   };

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

@@ -1,98 +1,5 @@
 <template>
-  <ele-modal
-    :visible="visible"
-    :append-to-body="true"
-    :close-on-click-modal="false"
-    custom-class="ele-dialog-form"
-    title="配置事项"
-    @update:visible="updateVisible"
-    :maxable="true"
-    :before-close="handleClose"
-    width="60%"
-  >
-    <el-tabs v-model="reportWorkType" type="card">
-      <el-tab-pane
-        v-for="i in tabPaneList"
-        :label="i.dictValue"
-        :name="i.dictCode"
-        :key="i.dictCode"
-      ></el-tab-pane>
-    </el-tabs>
-    <div style="margin: 10px 0"></div>
-
-    <el-form :model="params" label-width="115px" style="margin-top: 20px">
-      <el-row :gutter="20" style="margin-bottom: 10px">
-        <el-col :span="10">
-          <el-form-item label="关联产品方式">
-            <el-select
-              v-model="relateProductMethod"
-              placeholder="请选择关联产品方式"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in relateProductMethodOpeions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-if="relateProductMethod == 1" :span="10">
-          <el-form-item label="关联产品分类">
-            <ele-tree-select
-              multiple
-              clearable
-              :data="productCategory"
-              v-model="params.categoryLevels"
-              placeholder="请选择关联产品分类"
-              default-expand-all
-              labelKey="name"
-              valueKey="id"
-              @change="getMatterList"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <template v-if="relateProductMethod == 2">
-        <div style="margin-bottom: 20px">
-          <header-title title="关联产品">
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-plus"
-              class="ele-btn-icon"
-              @click="relateProductSelect"
-            >
-              选择产品
-            </el-button>
-          </header-title>
-
-          <ele-pro-table
-            ref="productTableRef"
-            :columns="productColumns"
-            :datasource="params.products"
-            :needPage="false"
-            row-key="id"
-            cache-key="user-setting-matter-process-product-2510181402"
-          >
-            <template v-slot:action="{ row }">
-              <el-link
-                type="danger"
-                :underline="false"
-                icon="el-icon-delete"
-                @click="productColumnsDeleteRow(row)"
-              >
-                删除
-              </el-link>
-            </template>
-          </ele-pro-table>
-        </div>
-      </template>
-    </el-form>
-
+  <div>
     <ele-pro-table
       ref="table"
       :columns="bankColumns"
@@ -127,7 +34,6 @@
             </el-link>
           </template>
         </el-popconfirm>
-
         <el-link
           type="primary"
           :underline="false"
@@ -139,14 +45,6 @@
       </template>
     </ele-pro-table>
 
-    <template v-slot:footer>
-      <el-button type="primary" @click="saveMatterList" :loading="butLoading">
-        确定
-      </el-button>
-
-      <el-button @click="handleClose">取消</el-button>
-    </template>
-
     <userSettingMatterAdd
       ref="userSettingMatterAddRef"
       @addMatter="addMatter"
@@ -159,7 +57,7 @@
       @changeProduct="changeRelateProduct"
       multiple
     ></ProductModal>
-  </ele-modal>
+  </div>
 </template>
 
 <script>
@@ -179,9 +77,20 @@
     name: 'UserSettingMatter',
     mixins: [dictMixins, tableColumnsMixin],
     components: { userSettingMatterAdd, ProductModal },
+    props: {
+      // 工序id
+      produceTaskId: {
+        type: String,
+        required: true
+      },
+      // 工序名称
+      produceTaskName: {
+        type: String,
+        required: true
+      }
+    },
     data() {
       return {
-        visible: false,
         // 	记录规则报工类型 产前、过程、产后
         reportWorkType: '2',
         // 事项列表
@@ -225,8 +134,6 @@
             slot: 'action'
           }
         ],
-        // 当前行数据
-        currentRow: null,
         // 添加事项列表
         addPOs: [],
         deletedIds: [],
@@ -307,6 +214,7 @@
     },
     created() {
       this.getProductCategory();
+      this.getMatterList();
     },
     methods: {
       // 获取产品分类
@@ -315,20 +223,11 @@
         console.log('产品分类', data);
         this.productCategory = data;
       },
-      updateVisible(val) {
-        this.visible = val;
-      },
-      openSetting(row) {
-        console.log('row', row);
-        this.currentRow = row;
-        this.visible = true;
-        this.getMatterList();
-      },
       // 查询事项数据
       async getMatterList() {
         const { list } = await produceTaskRecordRules({
           // 工序id
-          produceTaskId: this.currentRow.id,
+          produceTaskId: this.produceTaskId,
           pageNum: 1,
           size: 9999,
           reportWorkType: this.reportWorkType
@@ -368,15 +267,15 @@
         this.matterList.push({
           ...matter,
           id: id,
-          produceTaskId: this.currentRow.id,
-          produceTaskName: this.currentRow.name,
+          produceTaskId: this.produceTaskId,
+          produceTaskName: this.produceTaskName,
           reportWorkType: this.reportWorkType
         });
         this.addPOs.push({
           ...matter,
           id: id,
-          produceTaskId: this.currentRow.id,
-          produceTaskName: this.currentRow.name,
+          produceTaskId: this.produceTaskId,
+          produceTaskName: this.produceTaskName,
           reportWorkType: this.reportWorkType
         });
         this.handleSort();
@@ -401,8 +300,8 @@
           );
           this.updatePOs.push({
             ...matter,
-            produceTaskId: this.currentRow.id,
-            produceTaskName: this.currentRow.name,
+            produceTaskId: this.produceTaskId,
+            produceTaskName: this.produceTaskName,
             reportWorkType: this.reportWorkType
           });
         } else {
@@ -455,12 +354,12 @@
           await produceTaskRecordRulesBatchSave({
             addPOs: this.addPOs,
             deletedIds: this.deletedIds,
-            produceTaskId: this.currentRow.id,
-            produceTaskName: this.currentRow.name,
+            produceTaskId: this.produceTaskId,
+            produceTaskName: this.produceTaskName,
             updatePOs: this.updatePOs
           });
-          this.$message.success('保存成功');
           this.handleClose();
+
           this.butLoading = false;
         } catch (error) {
           this.butLoading = false;
@@ -468,8 +367,7 @@
       },
       // 关闭弹窗、清空数据
       handleClose() {
-        this.visible = false;
-        this.matterList = [];
+        this.getMatterList();
         this.addPOs = [];
         this.deletedIds = [];
         this.updatePOs = [];

src/views/technology/production/index.vue

@@ -159,14 +159,10 @@
 
     <!-- 配置事项 产前准备 产后检查-->
     <userSettingMatter ref="userSettingMatterRef" />
-    <!-- 配置事项  过程监测 -->
-    <userSettingMatterProcess
-      key="userSettingMatterProcessRef"
-      ref="userSettingMatterProcessRef"
-    ></userSettingMatterProcess>
 
     <WorkCenter ref="centerRefs" @changeCenter="determineChoose" />
 
+    <!-- 配置事项 过程监测 -->
     <userSettingMatterProcessDrawer
       ref="userSettingMatterProcessDrawerRef"
     ></userSettingMatterProcessDrawer>
@@ -185,7 +181,6 @@
   import work from '@/api/technology/work';
   import WorkCenter from './components/WorkCenter.vue';
   import userSettingMatter from './components/user-setting-matter.vue';
-  import userSettingMatterProcess from './components/user-setting-matter-process.vue';
   import userSettingMatterProcessDrawer from './components/user-setting-matter-process-drawer.vue';
   import dictMixins from '@/mixins/dictMixins';
 
@@ -200,7 +195,6 @@
       importDialog,
       WorkCenter,
       userSettingMatter,
-      userSettingMatterProcess,
       userSettingMatterProcessDrawer
     },
     data() {

vue.config.js

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