Merge remote-tracking branch 'origin/master'

src/views/modules/quotation/requestForQuote.vue

@@ -2586,14 +2586,6 @@ export default {
             this.$message.warning('请选择客户名称！')
             return
           }
-          if ((this.modalData.tracker === '' || this.modalData.tracker == null) && this.modalData.sourcing === 'Y') {
-            this.$message.warning('请选择采购专员编码！')
-            return
-          }
-          if ((this.modalData.trackerName === '' || this.modalData.trackerName == null) && this.modalData.sourcing !== 'Y') {
-            this.$message.warning('请选择采购专员名称！')
-            return
-          }
           if (this.modalData.projectId === '' || this.modalData.projectId == null) {
             this.$message.warning('请选择项目编码！')
             return
@@ -2603,11 +2595,11 @@ export default {
             return
           }
           if (this.modalData.quoter === '' || this.modalData.quoter == null) {
-            this.$message.warning('请选择询价专员编码！')
+            this.$message.warning('请选择报价专员编码！')
             return
           }
           if (this.modalData.quoterName === '' || this.modalData.quoterName == null) {
-            this.$message.warning('请选择询价专员名称！')
+            this.$message.warning('请选择报价专员名称！')
             return
           }
           if (this.modalData.priorityLevel === '' || this.modalData.priorityLevel == null) {
@@ -2622,17 +2614,20 @@ export default {
             this.$message.warning('请选择Delivery Terms！')
             return
           }
-          if (this.modalData.quoteType === '' || this.modalData.quoteType == null) {
-            this.$message.warning('请选择Quote Type！')
+        } else {
+          if ((this.modalData.tracker === '' || this.modalData.tracker == null) && this.modalData.sourcing === 'Y') {
+            this.$message.warning('请选择采购专员编码！')
+            return
+          }
+          if ((this.modalData.trackerName === '' || this.modalData.trackerName == null) && this.modalData.sourcing === 'Y') {
+            this.$message.warning('请选择采购专员名称！')
             return
           }
-        } else {
           if (this.projectPartListSelections.length === 0) {
             this.$message.warning('请选择物料信息！')
             return
           }
           this.confirmProjectPart();
-
           if (this.modalData.flag === '1') {
             quotationInformationSave(this.modalData).then(({data}) => {
               if (data && data.code === 0) {