2025-04-25

工序新增时，人员等级默认与加工中心一致高亮字段，输入编码能自动带出（Routing Tools的工序和工具） Routing Tools界面失真流程流转信息加入一个状态筛选，默认是审批中
9 months ago · ae201b3d0e
4 changed files with 88 additions and 16 deletions
--- a/src/api/part/routingManagement.js
+++ b/src/api/part/routingManagement.js
@ -156,3 +156,8 @@ export const queryPartListRouting = data => createAPI(`/plm/routingManagement/qu
 * 获取工具集合
 */
 export const queryToolList = data => createAPI(`/plm/routingManagement/queryToolList`,'post',data)
+
+/**
+ * 通过加工中心查人员等级
+ */
+export const queryLaborClassByWorkCenterNo = data => createAPI(`/plm/routingManagement/queryLaborClassByWorkCenterNo`,'post',data)
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@ -2771,8 +2771,6 @@
              } else {
                this.currentRow = {}
              }
-              // 加载当前的页签的table
-              this.refreshCurrentTabTable()
            }
          })
        } else {
@ -3291,8 +3289,6 @@
            } else {
              this.currentRow = {}
            }
-            // 加载当前的页签的table
-            this.refreshCurrentTabTable()
          }
        })
      },
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@ -412,7 +412,7 @@
    </el-dialog>

    <!-- 工具态框 -->
-    <el-dialog title="工具清单" :close-on-click-modal="false" v-drag :visible.sync="toolModelFlag" width="520px">
+    <el-dialog title="工具清单" :close-on-click-modal="false" v-drag :visible.sync="toolModelFlag" width="570px">
      <div class="rq">
        <el-form :inline="true" label-position="top" :model="toolData">
          <el-form-item :label="'工具编码'">
@ -426,7 +426,7 @@
          </el-form-item>
        </el-form>
        <el-table
-          :height="300"
+          :height="250"
          :data="toolList"
          @row-dblclick="doubleClickTool"
          border
@ -456,6 +456,7 @@
          :page-sizes="[20, 50, 100, 200, 500]"
          :page-size="pageSize3"
          :total="totalPage3"
+          :pager-count="3"
          layout="total, sizes, prev, pager, next, jumper">
        </el-pagination>
      </div>
@ -573,7 +574,7 @@
        <el-form-item prop="operationNo" :rules="RoutingToolRules.operationNo">
          <span style="cursor: pointer" slot="label" v-if="saveRoutingToolDisableModal === false" @click="queryOperationList()"><a>工序</a></span>
          <span v-else slot="label">工序</span>
-          <el-input v-model="routingToolData.operationNo" :disabled="saveRoutingToolDisableModal" style="width: 120px"></el-input>
+          <el-input v-model="routingToolData.operationNo" :disabled="saveRoutingToolDisableModal" @change="routingToolOperationBlur()" style="width: 120px"></el-input>
          <el-input v-model="routingToolData.operationName" disabled style="width: 340px"></el-input>
        </el-form-item>
      </el-form>
@ -981,6 +982,7 @@ import {
  toBecomeOfficialRouting, // 转正式Routing
  queryMaxOperationNo, // 查询最大工序号
  queryToolList, // 获取工具集合
+  queryLaborClassByWorkCenterNo, // 通过加工中心查人员等级
 } from '@/api/part/routingManagement.js'
 import {
  routingSearchAlternative, // routing 替代列表查询
@ -3611,7 +3613,30 @@ export default {
      })
    },

-    // 安全代码输入校验
+    // 工序输入校验
+    routingToolOperationBlur () {
+      let tempData = {
+        site: this.routingToolData.site,
+        partNo: this.routingToolData.partNo,
+        routingRevision: this.routingToolData.routingRevision,
+        routingType: this.routingToolData.routingType,
+        alternativeNo: this.routingToolData.alternativeNo,
+        operationNo: this.routingToolData.operationNo
+      }
+      queryOperationListByAlternative(tempData).then(({data}) => {
+        if (data && data.code === 0) {
+          if (data.rows.length > 0) {
+            this.routingToolData.operationId = data.rows[0].operationId
+            this.routingToolData.operationNo = data.rows[0].operationNo
+            this.routingToolData.operationName = data.rows[0].operationName
+          } else {
+            this.routingToolData.operationName = ''
+          }
+        }
+      })
+    },
+
+    // 工具输入校验
    routingToolBlur (tagNo) {
      let tempData = {
        tagno: tagNo,
@ -4659,6 +4684,7 @@ export default {
        this.componentData.workCenterNo = val.work_center_no
        this.componentData.workCenterDesc = val.work_center_desc
        this.componentData.workCenterType = val.work_center_type
+        this.getLaborClassByWorkCenter()
      }
      if (this.tagNo === 122) {
        this.routingToolData.toolId = val.tool_id
@ -4666,6 +4692,24 @@ export default {
      }
    },

+    // 通过加工中心查人员等级
+    getLaborClassByWorkCenter () {
+      let tempData = {
+        site: this.$store.state.user.site,
+        levelId: this.componentData.workCenterNo
+      }
+      queryLaborClassByWorkCenterNo(tempData).then(({data}) => {
+        if (data && data.code === 0) {
+          if (data.rows.length > 0) {
+            this.componentData.laborClassNo = data.rows[0].levelId
+            this.componentData.laborClassDesc = data.rows[0].levelDesc
+            this.componentData.setupLaborClassNo = data.rows[0].levelId
+            this.componentData.setupLaborClassDesc = data.rows[0].levelDesc
+          }
+        }
+      })
+    },
+
    // 机器调机时间改变
    changeMachSetupTime () {
      this.componentData.laborSetupTime = this.componentData.machSetupTime
@ -4689,6 +4733,7 @@ export default {
              this.componentData.workCenterNo = data.baseListData[0].work_center_no
              this.componentData.workCenterDesc = data.baseListData[0].work_center_desc
              this.componentData.workCenterType = data.baseListData[0].work_center_type
+              this.getLaborClassByWorkCenter()
              return
            }
          }
--- a/src/views/modules/processManagement/processFlowInfo.vue
+++ b/src/views/modules/processManagement/processFlowInfo.vue
@ -2,25 +2,32 @@
  <div class="mod-config">
    <el-form :inline="true" label-position="top" :model="searchData">
      <el-form-item :label="'单据号'">
-        <el-input v-model="searchData.documentNo" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.documentNo" clearable style="width: 110px"></el-input>
      </el-form-item>
      <el-form-item :label="'流程ID'">
-        <el-input v-model="searchData.workflowId" clearable style="width: 80px"></el-input>
+        <el-input v-model="searchData.workflowId" clearable style="width: 60px"></el-input>
      </el-form-item>
      <el-form-item :label="'流程名称'">
        <el-input v-model="searchData.workflowName" clearable style="width: 200px"></el-input>
      </el-form-item>
      <el-form-item :label="'当前节点ID'">
-        <el-input v-model="searchData.nodeId" clearable style="width: 80px"></el-input>
+        <el-input v-model="searchData.nodeId" clearable style="width: 60px"></el-input>
      </el-form-item>
      <el-form-item :label="'当前节点名称'">
-        <el-input v-model="searchData.nodeName" clearable style="width: 200px"></el-input>
+        <el-input v-model="searchData.nodeName" clearable style="width: 150px"></el-input>
      </el-form-item>
      <el-form-item :label="'流程创建人'">
-        <el-input v-model="searchData.createBy" clearable style="width: 100px"></el-input>
+        <el-input v-model="searchData.createBy" clearable style="width: 80px"></el-input>
      </el-form-item>
      <el-form-item :label="'当前节点审批人'">
-        <el-input v-model="searchData.updateBy" clearable style="width: 100px"></el-input>
+        <el-input v-model="searchData.updateBy" clearable style="width: 80px"></el-input>
+      </el-form-item>
+      <el-form-item label="单据状态">
+        <el-select v-model="searchData.documentStatus" clearable style="width: 100px">
+          <el-option label="草稿" value="草稿"></el-option>
+          <el-option label="审批中" value="审批中"></el-option>
+          <el-option label="已完成" value="已完成"></el-option>
+        </el-select>
      </el-form-item>
      <el-form-item :label="' '">
        <el-button type="primary" @click="getDataList()">查询</el-button>
@ -124,6 +131,7 @@ export default {
        nodeId: '',
        nodeName: '',
        documentNo: '',
+        documentStatus: '审批中',
        page: 1,
        limit: 10
      },
@ -153,6 +161,24 @@ export default {
          fixed: '',
          columnWidth: 120
        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 109002,
+          serialNumber: '109002Table1DocumentStatus',
+          tableId: "109002Table1",
+          tableName: "流程流转信息表",
+          columnProp: 'documentStatus',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '单据状态',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 90
+        },
        {
          userId: this.$store.state.user.name,
          functionId: 109002,
@ -161,7 +187,7 @@ export default {
          tableName: "流程流转信息表",
          columnProp: 'workflowId',
          headerAlign: "center",
-          align: "left",
+          align: "right",
          columnLabel: '流程ID',
          columnHidden: false,
          columnImage: false,
@ -196,7 +222,7 @@ export default {
          tableName: '流程流转信息表',
          columnProp: 'nodeId',
          headerAlign: 'center',
-          align: 'left',
+          align: 'right',
          columnLabel: '当前节点ID',
          columnHidden: false,
          columnImage: false,