Merge remote-tracking branch 'origin/master'

src/views/modules/erf/plannerSchedule.vue

@@ -453,13 +453,36 @@ export default {
         this.$message.warning('请输入试验工单号')
         return
       }
+      this.scheduleData.workOrderNo = String(this.scheduleData.workOrderNo).trim()
+      if (!this.scheduleData.workOrderNo) {
+        this.$message.warning('请输入试验工单号')
+        return
+      }
 
    /*   if (!this.scheduleData.scheduledDate) {
         this.$message.warning('请选择排产日期')
         return
       }*/
 
+      if (!this.scheduleData.workOrderNo.includes('#')) {
+        this.$confirm(
+          '试验工单号未包含“#”，是否继续提交排产？',
+          '操作提示',
+          {
+            confirmButtonText: '继续提交',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          this.submitSchedule()
+        }).catch(() => {})
+        return
+      }
+
+      this.submitSchedule()
+    },
 
+    submitSchedule() {
       this.scheduleLoading = true
 
       plannerSchedule(this.scheduleData).then(({data}) => {