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 @@
- 调机过程中人员等级
-
+ 调机过程中人员等级
+
@@ -389,8 +389,8 @@
- 人员等级
-
+ 人员等级
+
@@ -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) {