diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue
index 34308b8..401bee7 100644
--- a/src/views/modules/eam/eamProjectPartInfo.vue
+++ b/src/views/modules/eam/eamProjectPartInfo.vue
@@ -2652,7 +2652,6 @@ import {EventBus} from "../../../main";
finalPartNo: this.modalData.finalPartNo,
}
getFinalPartDesc(inData).then(({data}) => {
- console.log(data)
if (data && data.code === 0) {
if (data.data !== null) {
this.modalData.finalPartDesc = data.data.finalPartDesc
diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index ff55ae3..77aa279 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -530,7 +530,7 @@
-
+
@@ -578,7 +578,7 @@
-
+
@@ -618,7 +618,7 @@
-
+
@@ -645,7 +645,7 @@
-
+
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index 3619eb0..a2b86dd 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -355,7 +355,8 @@
调机过程中人员等级
-
+
+
@@ -381,7 +382,8 @@
人员等级
-
+
+
@@ -637,8 +639,8 @@ export default {
deep: true,
handler: function (newV, oldV) {
this.componentData.workCenterNo = this.componentData.workCenterNo.toUpperCase()
- this.componentData.laborClassDesc = this.componentData.laborClassDesc.toUpperCase()
- this.componentData.setupLaborClassDesc = this.componentData.setupLaborClassDesc.toUpperCase()
+ this.componentData.laborClassNo = this.componentData.laborClassNo.toUpperCase()
+ this.componentData.setupLaborClassNo = this.componentData.setupLaborClassNo.toUpperCase()
}
},
},
@@ -2829,6 +2831,54 @@ export default {
}
},
+ // 人员等级
+ setupLaborClassBlur (tagNo) {
+ 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 + "'"
+ }
+ verifyData(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ if (data.baseListData.length > 0) {
+ this.componentData.setupLaborClassNo = data.baseListData[0].class_no
+ this.componentData.setupLaborClassDesc = data.baseListData[0].class_desc
+ } else {
+ this.$message.warning('该人员等级不存在！')
+ this.componentData.setupLaborClassDesc = ''
+ }
+ } else {
+ this.$message.warning(data.msg)
+ this.componentData.setupLaborClassDesc = ''
+ }
+ })
+ }
+ },
+
+ // 人员等级
+ laborClassBlur (tagNo) {
+ 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 + "'"
+ }
+ verifyData(tempData).then(({data}) => {
+ if (data && data.code === 0) {
+ if (data.baseListData.length > 0) {
+ this.componentData.laborClassNo = data.baseListData[0].class_no
+ this.componentData.laborClassDesc = data.baseListData[0].class_desc
+ } else {
+ this.$message.warning('该人员等级不存在！')
+ this.componentData.laborClassDesc = ''
+ }
+ } else {
+ this.$message.warning(data.msg)
+ this.componentData.laborClassDesc = ''
+ }
+ })
+ }
+ },
+
// ======== 导出相关方法 ========
/**
* 导出excel
diff --git a/src/views/modules/quote/priceCheckProperties.vue b/src/views/modules/quote/priceCheckProperties.vue
index 04031b9..23462ea 100644
--- a/src/views/modules/quote/priceCheckProperties.vue
+++ b/src/views/modules/quote/priceCheckProperties.vue
@@ -10,6 +10,7 @@ import {
import TransferTable from "../common/transferTable.vue";
export default {
+ height: 200,
name: "priceCheckProperties",
components: {TransferTable},
props:{
@@ -187,7 +188,7 @@ export default {
mounted() {
this.$nextTick(() => {
/*第二个表格高度的动态调整*/
- this.secondHeight = window.innerHeight -this.height;
+ this.height = window.innerHeight - 210;
})
},
@@ -320,7 +321,7 @@ export default {
@@ -348,7 +349,7 @@ export default {
diff --git a/src/views/modules/quote/requestForQuote.vue b/src/views/modules/quote/requestForQuote.vue
index 0663816..3217ac3 100644
--- a/src/views/modules/quote/requestForQuote.vue
+++ b/src/views/modules/quote/requestForQuote.vue
@@ -97,7 +97,7 @@
+ style="width: 100%;margin-top: 5px">
客户编码
-
+
@@ -219,7 +219,7 @@
+ v-model="modalData.projectNo" @blur="projectNoBlur">
@@ -623,7 +623,7 @@
:quotation-no="quotationCurrentRow.quotationNo">
-
+
@@ -941,6 +941,8 @@ import {getPriceCheckPropertiesList} from "../../../api/quote/priceCheckProperti
import * as XLSX from 'xlsx';
import priceCheckProperties from "./priceCheckProperties.vue";
import quotationUpload from "../quote/quotation_upload.vue";
+import {queryCustomerList} from "../../../api/customer/customer";
+import {queryProjectList} from "../../../api/project/project";
export default {
computed: {
@@ -1147,6 +1149,8 @@ export default {
rejectFlag: '',
rejectStepId: '',
isReject: '',
+ projectManager: '',
+ projectOwner: '',
projectPartIds: []
},
quotationDetailData: {
@@ -2251,7 +2255,7 @@ export default {
mounted() {
this.$nextTick(() => {
/*第二个表格高度的动态调整*/
- this.secondHeight = window.innerHeight -this.height;
+ this.height = window.innerHeight - 210;
})
},
created() {
@@ -3188,6 +3192,57 @@ export default {
// }
},
+ customerNoBlur(){
+ let params = {
+ customerNo: this.modalData.customerNo,
+ createBy: this.$store.state.user.name,
+ }
+ queryCustomerList(params).then(({data}) => {
+ if (data && data.code === 0) {
+ if (data.rows.length === 1){
+ this.modalData.customerDesc = data.rows[0].customerDesc
+ }else {
+ this.modalData.projectNo = ''
+ this.modalData.projectDesc = ''
+ this.modalData.customerDesc = ''
+ }
+ }else {
+ this.$message.warning(data.message)
+ }
+ }).catch((error) => {
+ this.$message.error(error)
+ })
+ },
+ projectNoBlur(){
+ let params = {
+ projectNo: this.modalData.projectNo,
+ customerNo: this.modalData.customerNo,
+ createBy: this.$store.state.user.name,
+ buId: this.modalData.buId,
+ }
+ queryProjectList(params).then(({data})=>{
+ if (data && data.code === 0) {
+ if (data.rows.length === 1) {
+ this.modalData.projectDesc = data.rows[0].projectDesc
+ this.modalData.projectId = data.rows[0].projectId
+ this.modalData.finalCustomerId = data.rows[0].finalCustomerId
+ this.modalData.finalCustomerName = data.rows[0].finalCustomerName
+ this.modalData.projectManagerName = data.rows[0].projectManager.split('-')[1]
+ this.modalData.projectOwnerName = data.rows[0].projectOwner.split('-')[1]
+ this.getProjectPartList()
+ }else {
+ this.modalData.projectDesc = ''
+ this.modalData.finalCustomerId = ''
+ this.modalData.finalCustomerName = ''
+ }
+ }else {
+ this.$message.warning(data.msg)
+ }
+ }).catch((error)=>{
+ this.$message.error(error)
+ })
+ },
+
// ======== 询价单附件的相关方法 ========
/**
* 获取询价单附件列表