页面修改

src/components/Ticketing/TicketOrder.vue

@@ -576,7 +576,7 @@
                   <div class="_oll_praise" v-if="item.OrderSource==2">
                     <span class="iconfont icon-dingdanhao"></span>
                     <el-tooltip effect="dark" :content="item.ClientName" placement="top" popper-class="max-w250">
-                      <p class="_oll_lxr_name">{{item.ClientName}} hh</p>
+                      <p class="_oll_lxr_name">{{item.ClientName}} </p>
                     </el-tooltip>
                   </div>
                   <div class="_oll_lxr_b" v-if="item.OrderSource==1|| item.OrderSource==3 ">

src/components/commonPage/orderTicketUnion.vue

+<style>
+</style>
+<template>
+  <div class="clearfix">
+    <el-form label-width="100px">
+      <el-form-item label="订单编号">
+        {{orderInfo.OrderId}}
+      </el-form-item>
+      <el-form-item label="团期编号">
+        {{orderInfo.TCID}}
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-radio v-model="postMsg.IsSure" :label="0">暂定</el-radio>
+        <el-radio v-model="postMsg.IsSure" :label="1">确定</el-radio>
+      </el-form-item>
+      <el-form-item label="机票命令">
+        <el-input type="textarea" v-model="postMsg.TicketOrder" :autosize="{ minRows: 2, maxRows: 4}"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <input type="button" class="normalBtn Rs_leaderSearch" @click="saveTicketUnion" value="确定" />
+        <input type="button" class="normalBtn Rs_leaderSearch" @click="closeDialog()" value="关闭" />
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+  export default {
+    props: ["orderInfo"],
+    data() {
+      return {
+        postMsg: {
+          TCID: 0,
+          OrderId: 0,
+          TicketOrder: "", //机票导入命令
+          TicketUnionId: 0, //判断新增还是修改
+          IsSure: 0, //0-暂定，1-确定
+        },
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      saveTicketUnion() {
+        //员工
+        this.apipost("AirTicket_post_ImportUnionOrderFlight", this.postMsg,
+          (res) => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              this.clearMsg();
+              //调用父页面刷新方法
+              this.$emit("success");
+            }
+          }
+        );
+      },
+      //清空表单
+      clearMsg() {
+        this.postMsg.TCID = 0;
+        this.postMsg.OrderId = 0;
+        this.postMsg.TicketOrder = "";
+        this.postMsg.TicketUnionId = 0;
+        this.postMsg.IsSure = 0;
+      },
+      //关闭弹窗
+      closeDialog() {
+        this.$emit("close");
+      },
+    },
+    watch: {
+      //监听订单属性编号
+      orderInfo: {
+        handler(newVal) {
+          this.postMsg.TCID = this.orderInfo.TCID;
+          this.postMsg.OrderId = this.orderInfo.OrderId;
+          this.postMsg.TicketUnionId = this.orderInfo.TicketUnionId;
+        },
+        deep: true,
+        immediate: true,
+      },
+    },
+  };
+
+</script>

src/components/orderCommon/edit-orderform.vue

@@ -487,14 +487,12 @@
               <el-upload ref="my-upload" class="upload-demo" :http-request="uploadFileBtnFJ" :multiple="true"
                 :show-file-list="true" :on-preview="previewFileFJ" :on-remove="removeFileFJ" :limit="1"
                 :file-list="fileFujianList" action>
-
                 <el-button size="small" type="primary">点击上传</el-button>
               </el-upload>
             </div>
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注" prop="Remarks">
@@ -627,11 +625,9 @@
         comSelect: -1,
         OpSetLossPeople: 0,
         OpSetLossMoney: 0,
-
         IsChargeLossOrders: 0,
         Unit_PriceList: [], //成交单价下拉数据
         LessMoney: 0,
-
         uploadLloading: false,
         fileFujianList: [],
         employeeMsg: {
@@ -1528,13 +1524,11 @@
             Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) +
             this.OpSetLossMoney;
         }
-
         this.getTicheng();
         if (!t) {
           this.getTypePrice2();
         }
       },
-
       yzBigBed2() {
         let x =
           Number(this.addMsg.AirticketNum) +
@@ -1730,10 +1724,8 @@
           (res) => {
             if (res.data.resultCode == 1) {
               this.$message.success(res.data.message);
-
               this.clearMsg();
 
-
               if (res.data.data == 1) {
 
               }
@@ -1901,8 +1893,6 @@
             }
           });
       },
-
-
       getEmployee() {
         //员工
         this.apipost(