From 1f4584e799936d023057aac77472e327eae86906 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 26 Nov 2024 14:07:36 +0800
Subject: [PATCH] 2024-11-26

---
 src/views/modules/part/partInformation.vue   |  5 +---
 src/views/modules/part/routingManagement.vue | 30 ++++++++++----------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index 03b1f72..22bb688 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -3129,10 +3129,6 @@
        * 物料信息新增/编辑
        */
       saveData () {
-        // if (this.modalData.partNo === '' || this.modalData.partNo == null) {
-        //   this.$message.warning('请填写物料编码！')
-        //   return
-        // }
         if (this.modalData.partDesc === '' || this.modalData.partDesc == null) {
           this.$message.warning('请填写物料描述！')
           return
@@ -3148,6 +3144,7 @@
         if (this.modalData.flag === '1') {
           partInformationSave(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
+              this.searchData.partNo = data.partNo
               this.getDataList()
               this.modalFlag = false
               this.$message({
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index 6cd0a2f..3613883 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -370,8 +370,8 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
         <el-form-item style="margin-left: 235px" prop="setupLaborClassNo">
-          <span style="cursor: pointer" slot="label" @click="getBaseList(217, 2)"><a herf="#">调机过程中人员等级</a></span>
-          <el-input v-model="componentData.setupLaborClassNo" @blur="setupLaborClassBlur(217)" style="width: 70px"></el-input>
+          <span style="cursor: pointer" slot="label" @click="getBaseList(517, 2)"><a herf="#">调机过程中人员等级</a></span>
+          <el-input v-model="componentData.setupLaborClassNo" @blur="setupLaborClassBlur(517)" style="width: 70px"></el-input>
           <el-input v-model="componentData.setupLaborClassDesc" disabled style="width: 148px"></el-input>
         </el-form-item>
       </el-form>
@@ -389,8 +389,8 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="laborClassNo">
-          <span style="cursor: pointer" slot="label" @click="getBaseList(217, 1)"><a herf="#">人员等级</a></span>
-          <el-input v-model="componentData.laborClassNo" @blur="laborClassBlur(217)" style="width: 70px"></el-input>
+          <span style="cursor: pointer" slot="label" @click="getBaseList(517, 1)"><a herf="#">人员等级</a></span>
+          <el-input v-model="componentData.laborClassNo" @blur="laborClassBlur(517)" style="width: 70px"></el-input>
           <el-input v-model="componentData.laborClassDesc" disabled style="width: 148px"></el-input>
         </el-form-item>
       </el-form>
@@ -3494,14 +3494,14 @@ export default {
       this.$nextTick(() => {
         let strVal = ''
         let conSql = ''
-        if (this.modalData.bu === null || this.modalData.bu === '') {
-          this.$message.warning("请选择BU!")
-          return
-        } else {
-          conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
-        }
-        if (val === 217) {
-          if(type === 1) {
+        // if (this.modalData.bu === null || this.modalData.bu === '') {
+        //   this.$message.warning("请选择BU!")
+        //   return
+        // } else {
+        //   conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
+        // }
+        if (val === 517) {
+          if (type === 1) {
             strVal = this.componentData.laborClassNo
           } else if (type === 2) {
             strVal = this.componentData.setupLaborClassNo
@@ -3519,7 +3519,7 @@ export default {
      * @param val
      */
     getBaseData (val) {
-      if (this.tagNo === 217) {
+      if (this.tagNo === 517) {
         if (this.tagNo1 === 1) {
           this.componentData.laborClassNo = val.class_no
           this.componentData.laborClassDesc = val.class_desc
@@ -3596,7 +3596,7 @@ export default {
       if (this.componentData.setupLaborClassNo != null && this.componentData.setupLaborClassNo !== '') {
         let tempData = {
           tagno: tagNo,
-          conditionSql: " and class_no = '" + this.componentData.setupLaborClassNo + "'" + " and site  = '" + this.modalData.site + "'" + " and bu_no  = '" + this.modalData.buNo + "'"
+          conditionSql: " and class_no = '" + this.componentData.setupLaborClassNo + "'" + " and site  = '" + this.modalData.site + "'"
         }
         verifyData(tempData).then(({data}) => {
           if (data && data.code === 0) {
@@ -3616,7 +3616,7 @@ export default {
       if (this.componentData.laborClassNo != null && this.componentData.laborClassNo !== '') {
         let tempData = {
           tagno: tagNo,
-          conditionSql: " and class_no = '" + this.componentData.laborClassNo + "'" + " and site  = '" + this.modalData.site + "'" + " and bu_no  = '" + this.modalData.buNo + "'"
+          conditionSql: " and class_no = '" + this.componentData.laborClassNo + "'" + " and site  = '" + this.modalData.site + "'"
         }
         verifyData(tempData).then(({data}) => {
           if (data && data.code === 0) {