解决冲突

src/views/education/ProducSchedule.vue

@@ -305,6 +305,7 @@ export default {
         },
         //添加
         addFun(value){
+          value.ID = ''
            let data = value
            if (value.LinVar.trim() === '') {
               this.typeV = '5'
@@ -335,24 +336,40 @@ export default {
           var $this = this
           let data = value
            console.log('aa',JSON.stringify(data))
-           this.$axios({
+            this.$axios({
+              method:"post",
+              url:`/api/Schedule/Schedule_CheckWindowSave`,//检验是否可添加
+              data:value
+            }).then((res)=>{
+              console.log('resadd==>',res)
+              if(res.data.code != 0){
+                  this.typeV = '9'
+                this.deletetext = res.data.msg
+                this.pathE = data
+                this.deleteShow = true
+              }else{
+                this.$axios({
                 method:"post",
                 url:`/api/Schedule/Schedule_WindowEditSave`,
                 data:data
-            }).then((res)=>{
-               if(res.data.code != 0){
-                  this.typeV = '5'
-                  this.deleteShow = true
-                }else{
-                  this.typeV = '6'
-                   this.cancelFun()
-                }
+              }).then((res)=>{
+                if(res.data.code != 0){
+                    this.typeV = '5'
+                    this.deleteShow = true
+                  }else{
+                    this.typeV = '6'
+                    this.cancelFun()
+                  }
                   this.deletetext = res.data.msg
                   var postData = this.resetData()
                   $this.query(postData)
             }).catch(function(err){
                 console.log('err',err)
             })
+              }
+            }).catch(function(err){
+                console.log('err',err)
+            })
                
         },
         resetData () {

src/views/education/component/linePop.vue

@@ -587,13 +587,13 @@ export default {
                         ProductID:this.ProductID,
                         PID:this.PID,
                         Quantity: this.Quantity,
-                        DeliveryDt: this.DeliveryDt,
+                        DeliveryDt: this.$moment(this.DeliveryDt).format('YYYY-MM-DD HH:mm:ss'),
                         VPID: this.VPID,
                         VStatus: this.VStatus,
                         VDeliveryDt: this.VDeliveryDt,
                         VPlanQuantity: this.VPlanQuantity
                     }
-
+                    
                     // if(this.tData != 0){
                     //     for(let i=0;i<this.tData.length;i++){
                     //         if(this.producV == this.tData[i].Name){

vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
             '/api': {
                 //这里最好有一个 /
                 // 192.168.1.237  192.168.1.125
-                target: 'http://192.168.1.180:8802', // 后台接口域名
+                target: 'http://192.168.1.125:8803', // 后台接口域名
                 ws: true, //如果要代理 websockets，配置这个参数
                 secure: false, // 如果是https接口，需要配置这个参数
                 changeOrigin: true, //是否跨域