页面修改

src/components/SalesModule/groupTourOrder.vue

@@ -2499,6 +2499,8 @@
           Remarks: "",
           //1-可以修改，0-不能修改【默认可以修改】
           isOrder: "1",
+          UnionRemark: "", //新联运备注
+          IsIntermodal: 0, //是否联运
         },
         IsUnion: 2,
         IsChargeLossOrders: 0,
@@ -3476,6 +3478,8 @@
           this.remarksMsg.Remarks = obj.remarks;
           this.remarksMsg.OldRemarks = obj.remarks;
           this.remarksMsg.isOrder = obj.isOrder;
+          this.remarksMsg.UnionRemark = obj.unionRemark;
+          this.remarksMsg.IsIntermodal = obj.isIntermodal;
           this.isShowLayerRemarks = true;
         }
       },

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -3270,6 +3270,8 @@
           Remarks: "",
           //1-可以修改，0-不能修改【默认可以修改】
           isOrder: 1,
+          UnionRemark: "", //新联运备注
+          IsIntermodal: 0, //是否联运
         },
         IsChargeLossOrders: 0,
         Unit_PriceList: [], //成交单价下拉数据
@@ -4623,6 +4625,8 @@
           this.remarksMsg.OrderId = obj.orderId;
           this.remarksMsg.Remarks = obj.remarks;
           this.remarksMsg.OldRemarks = obj.remarks;
+          this.remarksMsg.UnionRemark = obj.unionRemark;
+          this.remarksMsg.IsIntermodal = obj.isIntermodal;
           this.isShowLayerRemarks = true;
         }
       },

src/components/SalesModule/groupTourOrderOne.vue

@@ -769,8 +769,7 @@
 <template>
   <div class="flexOne groupts" style="min-width: 1200px;">
     <!-- 修改信息 -->
-    <div class="productQuerybottomLayer ownScrollbarStyle" v-if="isShowLayer"
-    :style="{ height: ScreenHeight }">
+    <div class="productQuerybottomLayer ownScrollbarStyle" v-if="isShowLayer" :style="{ height: ScreenHeight }">
       <p>{{$t('pub.updateMsg')}}
         <span class="fr">
           <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmit()" />
@@ -1467,7 +1466,8 @@
               <p style="min-width: 180px;">{{$t('hotel.hotel_StartTeam')}}：{{item.startDate}}</p>
               <p>{{$t('restaurant.res_oderTime')}}：{{item.createDate}}</p>
               <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
-              <p v-if='(item.commissionMoney&&item.commissionMoney>0)||(item.opcommission&&item.opcommission>0)' style="color:red">
+              <p v-if='(item.commissionMoney&&item.commissionMoney>0)||(item.opcommission&&item.opcommission>0)'
+                style="color:red">
                 <template v-if="item.commissionMoney&&item.commissionMoney>0">
                   <span style="float: left;">销售{{$t('salesModule.Commission')}}：</span>
                   <commissionDialog :objNew="item" :OP="0"></commissionDialog>
@@ -1911,7 +1911,9 @@
           OldRemarks: '',
           Remarks: '',
           //1-可以修改，0-不能修改【默认可以修改】
-          isOrder: '1'
+          isOrder: '1',
+          UnionRemark: "", //新联运备注
+          IsIntermodal: 0, //是否联运
         },
         IsUnion: 2,
         IsChargeLossOrders: 0,
@@ -2792,14 +2794,7 @@
             })
             .then(() => {
               return
-              this.isShowLayerRemarks = true
-              this.isShowLayer = false
-              this.$refs['addMsg'].resetFields()
-              this.clearMsg()
-              this.remarksMsg.OrderId = obj.orderId
-              this.remarksMsg.Remarks = obj.remarks
-              this.remarksMsg.OldRemarks = obj.remarks
-              this.remarksMsg.isOrder = obj.isOrder
+
             })
             .catch(() => {
               this.$message.info("已取消！");
@@ -2809,10 +2804,12 @@
           this.isShowLayer = false
           this.$refs['addMsg'].resetFields()
           this.clearMsg()
-          this.remarksMsg.OrderId = obj.orderId
-          this.remarksMsg.Remarks = obj.remarks
-          this.remarksMsg.OldRemarks = obj.remarks
-          this.remarksMsg.isOrder = obj.isOrder
+          this.remarksMsg.OrderId = obj.orderId;
+          this.remarksMsg.Remarks = obj.remarks;
+          this.remarksMsg.OldRemarks = obj.remarks;
+          this.remarksMsg.isOrder = obj.isOrder;
+          this.remarksMsg.UnionRemark = obj.unionRemark;
+          this.remarksMsg.IsIntermodal = obj.isIntermodal;
         }
       },
       getDetail(obj) {
@@ -4089,9 +4086,9 @@
       this.userId = this.getLocalStorage().EmployeeId
       if (this.$route.query.id) {
         this.msg.tempOrderId = this.$route.query.id
-      }else if(this.$route.query.OrderId){
+      } else if (this.$route.query.OrderId) {
         this.msg.tempOrderId = this.$route.query.OrderId
-      }else if(this.$route.query.crmOrderObj){
+      } else if (this.$route.query.crmOrderObj) {
         let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
         this.msg.tempOrderId = crmOrderObj.OrderId
       }

src/components/orderCommon/order-remark.vue

@@ -28,7 +28,7 @@
 </style>
 <!--订单备注-->
 <template>
-  <div class="commonOrderRemarkForm" style="height:150px;">
+  <div class="commonOrderRemarkForm" style="height:250px;">
     <p class="title">
       修改备注
       <span class="fr" v-if="postMsg.isOrder == 1" style="margin-right: 0px">
@@ -47,6 +47,20 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="3">
+          <el-form-item label="联运信息">
+            <el-checkbox v-model="postMsg.IsIntermodal" :true-label="1" :false-label="0">
+            </el-checkbox>
+          </el-form-item>
+        </el-col>
+        <el-col :span="21">
+          <el-form-item label="联运备注">
+            <el-input v-model="postMsg.UnionRemark" type="textarea" maxlength="500">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
   </div>
 </template>
@@ -64,9 +78,10 @@
         },
         postMsg: {
           OrderId: "0",
-          OldRemarks: "",
           Remarks: "",
           isOrder: 1, //1-可以修改，0-不能修改【默认可以修改】
+          UnionRemark: "", //新联运备注
+          IsIntermodal: 0, //是否联运
         },
       };
     },
@@ -115,10 +130,12 @@
       remarksMsg: {
         immediate: true,
         handler(newVal) {
+          console.log("remarksMsg", this.remarksMsg);
           this.postMsg.OrderId = this.remarksMsg.OrderId;
-          this.postMsg.OldRemarks = this.remarksMsg.OldRemarks;
           this.postMsg.Remarks = this.remarksMsg.Remarks;
           this.postMsg.isOrder = this.remarksMsg.isOrder;
+          this.postMsg.UnionRemark = this.remarksMsg.UnionRemark;
+          this.postMsg.IsIntermodal = this.remarksMsg.IsIntermodal;
         },
         deep: true
       },