修改订单预约限制操作

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -1052,7 +1052,7 @@ export default {
       let st = false;
       this.selectionList.forEach( i =>{
         console.log("yuyuyuuyu",i);
-        if(i.reservationStatusName === "已预约"){
+        if(i.reservationStatus === "30"){
           st = true;
           this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！");
         }
@@ -1096,7 +1096,7 @@ export default {
         let lost = false;
         for (const i of this.selectionList) {
           console.log("yuyuyuuyu",i);
-          if(i.reservationStatusName == "已预约"){
+          if(i.reservationStatus == "30"){
             st = true;
             this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！");
           }
@@ -1249,12 +1249,12 @@ export default {
     //通知提货
     handleCallDelivery(ind){
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning("请选择至少一条数据!!!");
         return;
       }
-      let a = this.selectionList.find( i => i.reservationStatusName == '已预约');
+      let a = this.selectionList.find( i => i.reservationStatus == '30');
       if(!!a){
-        this.$message.warning("有已预约的数据，不能修改服务类型");
+        this.$message.warning("有已预约的数据，不能修改！！！");
         return ;
       }
       switch (ind) {

src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@@ -1033,7 +1033,7 @@ export default {
       }
       let st = false;
       this.selectionList.some( i =>{
-        if(i.stateName === "已预约"){
+        if(i.reservationStatus === "30"){
           st = true;
           this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！");
         }
@@ -1194,6 +1194,11 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+      let a = this.selectionList.find( i => i.reservationStatus == '30');
+      if(!!a){
+        this.$message.warning("有已预约的数据，不能修改！！！");
+        return ;
+      }
       switch (ind) {
         case '1':
           let ids = [];

src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue

@@ -1017,7 +1017,7 @@ export default {
       }
       let st = false;
       this.selectionList.some( i =>{
-        if(i.reservationStatusName === "已预约"){
+        if(i.reservationStatus === "30"){
           st = true;
           this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！");
         }
@@ -1061,7 +1061,7 @@ export default {
         let st = false;
         let lost = false;
         for (const i of this.selectionList) {
-          if(i.reservationStatusName == "已预约"){
+          if(i.reservationStatus == "30"){
             st = true;
             this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！");
           }
@@ -1215,6 +1215,11 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+      let a = this.selectionList.find( i => i.reservationStatus == '30');
+      if(!!a){
+        this.$message.warning("有已预约的数据，不能修改！！！");
+        return ;
+      }
       switch (ind) {
         case '1':
           let ids = [];

src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@@ -1266,7 +1266,7 @@ export default {
         let st = false;
         let lost = false;
         for (const i of this.selectionList) {
-          if(i.reservationStatusName == "已预约"){
+          if(i.reservationStatus == "30"){
             st = true;
             this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！");
             return;
@@ -1399,7 +1399,7 @@ export default {
       let consigneePerson = '';
       let consigneeMobile = '';
       this.selectionList.some( i =>{
-        if(i.reservationStatusName === "已预约"){
+        if(i.reservationStatus === "30"){
           st = true;
           this.$message.warning(i.orderCode+"已预约，请勿重复预约！！！");
         }
@@ -1432,6 +1432,11 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }
+      let a = this.selectionList.find( i => i.reservationStatus == '30');
+      if(!!a){
+        this.$message.warning("有已预约的数据，不能修改！！！");
+        return ;
+      }
       switch (ind) {
           case '1':
             let ids = [];

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -621,6 +621,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'sendWarehouseName',
+          label: '发站仓',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: '',
           label: '操作',