no message

src/App.vue

@@ -26,7 +26,7 @@ export default {
 <style>
 @import "./assets/css/tablevoerride.css";
 @import "./assets/global/font.css";
-@import "//at.alicdn.com/t/font_1627123_khj62ff3f6k.css";
+@import "//at.alicdn.com/t/font_1627123_tcs57r3ak3a.css";
 @import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css");
 /* @import './assets/css/common.css'; */
 @import "./assets/css/init.css";

src/components/guestManagement/Agreement.vue

@@ -6,6 +6,29 @@
 .add-Enclosure-left{
   display: flex;
 }
+.tem-but-box{
+  display: flex;
+}
+.item-but{
+  margin-right: 10px;
+}
+.numIcon{
+  font-size: 12px;
+  padding: 5px;
+  color: #409eff;
+}
+.tatusText.grey{
+  color: grey;
+}
+.tatusText.success{
+  color: #21BA45;
+}
+.tatusText.error{
+  color: #F2C037;
+}
+.tatusText.Black{
+  color: Black;
+}
 </style>
 <template>
     <div class="Business">
@@ -14,13 +37,21 @@
           <el-col :span="8">
             <el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID" @blur="getList"></el-input>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="4">
             <el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择" 
-            @change="getList">
-              <el-option 
-              v-for="item in ticketingStatusList"
-              :key="item.id" :label="item.Name" :value="item.Id"></el-option>
-          </el-select>
+              @change="getList">
+                <el-option 
+                v-for="item in ticketingStatusList"
+                :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="4">
+            <el-select size="mini" width="200" v-model="msg.OrderStatus" placeholder="请选择" 
+              @change="getList">
+                <el-option 
+                v-for="item in orderStatusList"
+                :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
+            </el-select>
           </el-col>
         </el-row>
         <el-button plain icon="el-icon-plus" type="primary" size="mini" class="margin-right0" @click="addBusiness">创建订单</el-button>
@@ -35,12 +66,14 @@
         style="width: 100%"
         row-class-name="font-size-12">
         <el-table-column
+            fixed
             prop="CreateByName"
             label="下单人"
             show-overflow-tooltip>
         </el-table-column>
         
-        <el-table-column 
+        <el-table-column
+            fixed
             label="订单号"
             show-overflow-tooltip>
             <template slot-scope="scope">
@@ -71,24 +104,31 @@
             label="订单金额"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              <!-- Edit order amount -->
-              <p @click="editOrderAmount(scope)" class="font-color-link cp">{{scope.row.Money}}</p>
+              <p @click="editOrderAmount(scope.row)" class="font-color-link cp">{{scope.row.Money}}</p>
             </template>
         </el-table-column>
         <el-table-column 
-            prop="IncomeMoney"
             label="实收"
             show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.IncomeMoney}}<i class="iconfont iconjia- numIcon"></i>
+            </template>
         </el-table-column>
         <el-table-column 
             prop="PayMoney"
             label="付款"
             show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.PayMoney}}<i class="iconfont iconjia- numIcon"></i>
+            </template>
         </el-table-column>
         <el-table-column 
             prop="BackMoney"
             label="退款"
             show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.BackMoney}}<i class="iconfont iconjia- numIcon"></i>
+            </template>
         </el-table-column>
         <el-table-column
             prop="TaxMoney"
@@ -96,7 +136,7 @@
             show-overflow-tooltip>
         </el-table-column>
         <el-table-column
-            prop=""
+            prop="DueinMoney"
             label="待收"
             show-overflow-tooltip>
         </el-table-column>
@@ -121,9 +161,18 @@
             show-overflow-tooltip>
         </el-table-column>
         <el-table-column
-            prop="TicketStatusName"
             label="出票状态"
             show-overflow-tooltip>
+            <template slot-scope="scope">
+              <p @click="modifyStatus(scope.row)" 
+              class="cp tatusText"
+              :class="scope.row.TicketStatus==1?'grey':
+              (scope.row.TicketStatus==2?'success':
+              (scope.row.TicketStatus==3?'error':
+              (scope.row.TicketStatus==4?'Black':'')))">
+                {{scope.row.TicketStatusName}}
+              </p>
+            </template>
         </el-table-column>
         <el-table-column
             prop="Remark"
@@ -140,9 +189,22 @@
             label="下单时间"
             show-overflow-tooltip>
         </el-table-column>
-        <el-table-column 
+        <el-table-column
+            fixed="right"
             label="操作"
             show-overflow-tooltip>
+            <template slot-scope="scope">
+                <div class="item-but-box">
+                  <el-tooltip 
+                  v-if="scope.row.TicketStatus==1&&scope.row.OrderStatus==1"
+                   class="item-but" effect="dark" content="取消订单" placement="top">
+                      <i class="iconfont iconquxiao cp" @click="cancelOrder(scope.row)"></i>
+                  </el-tooltip>
+                  <!-- <el-tooltip class="item-but" effect="dark" content="财务" placement="top">
+                      <i class="iconfont iconcaiwuzhongxin cp"></i>
+                  </el-tooltip> -->
+                </div>
+            </template>
         </el-table-column>
       </el-table>
       </div>
@@ -159,7 +221,11 @@ export default {
   props: ["ID", "BusinessType"],
   data() {
     return {
-      ticketingStatusList:[],
+      orderStatusList:[
+        {Name:'正常',Id:'1'},
+        {Name:'取消',Id:'2'}
+      ],//订单状态
+      ticketingStatusList:[],// 出票状态
       dataList: [],
       loading: false,
       msg: {
@@ -168,7 +234,7 @@ export default {
         OrderId:"",
         GuestId:"",
         TicketStatus: '0',
-        OrderStatus:"",
+        OrderStatus:"1",
         StartCityName: "",
         EndCityName: "",
         EnterID: ""
@@ -188,13 +254,89 @@ export default {
     
     this.getList();
     this.GetTicketStatusEnumList()
+    let $this = this
+    this.MsgBus.$on("closeGetList", function() { 
+      $this.getList()
+    });
   },
   methods: {
+    // 修改出票状态
+    modifyStatus(row){
+      if(row.OrderStatus==2){
+        let tips = '该订单已取消，不能修改出票状态'
+        this.$confirm(tips, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            
+        }).catch(() => {
+                      
+        });
+      }else{
+        if(row.TicketStatus==4){
+          return
+        }else{
+          let $this = this;
+          this.MsgBus.$emit("reviseTicketOrderBoxOpen", $this.ID, row, true);
+        }
+      }
+      
+    },
+    // 取消订单
+    cancelOrder(row){
+      let tips = '此操作将取消该订单，是否继续取消?'
+      this.$confirm(tips, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+      }).then(() => {
+          this.apipost('/api/Order/SetGuestOrderState', {
+              OrderId: row.OrderId,
+              Type: '1',
+          }, res=>{
+              if (res.data.resultCode == 1) {
+                  this.$message.success(res.data.message);
+                  this.getList()
+              }
+          })
+      }).catch(() => {
+          this.$message({
+              type: 'info',
+              message: '已取消'
+          });          
+      });
+    },
     // 编辑订单金额
-    editOrderAmount(scope){
-      console.log(scope.row, '111111')
-      let $this = this;
-      this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, scope.row, true);
+    editOrderAmount(row){
+      if(row.TicketStatus==1&&row.OrderStatus==1){
+        let $this = this;
+        this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, row, true);
+      }else{
+        let tips = ''
+        if(row.TicketStatus==2&&row.OrderStatus==1){
+          tips = '已出票'
+        }
+        if(row.TicketStatus==3&&row.OrderStatus==1){
+          tips = '航班熔断'
+        }
+        if(row.TicketStatus==4&&row.OrderStatus==1){
+          tips = '用户取消航班'
+        }
+        if(row.OrderStatus==2){
+          tips = '已取消'
+        }
+        this.$confirm('此订单'+tips+'，无法编辑订单金额?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            
+        }).catch(() => {
+                      
+        });
+      }
+      
     },
     openDetails(scope) {
       console.log(scope.row.ID);

src/plugins/index.js

@@ -17,7 +17,7 @@ export default {
                 //domainUrl = "http://localhost:5003";
                 let locationName = window.location.hostname;
                 //旅游ERPApi
-                let domainPostUrl = "http://192.168.10.214"
+                let domainPostUrl = "http://192.168.10.2:8083"
                 if (this.isOnline()) {
                     if (window.location.host.indexOf('fcrmyx.oytour.com') != -1) {
                         domainUrl = "http://crm.oytour.com"
@@ -44,9 +44,9 @@ export default {
                     //常用提交数据URL 
                     PostUrl: domainUrl,
                     PostUrl2: domainPostUrl + "/api/common/post",
-                    javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.2.215:9000",
-                    ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
-                    UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8130",
+                    javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.10.215:9000",
+                    ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.10.214:8130',
+                    UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.10.214:8120",
                     LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
                 };
                 return obj;

src/views/index.vue

@@ -330,6 +330,12 @@ export default {
       $this.obj = obj;
       $this.dialogTicketOrderVisible = true;
     });
+    this.MsgBus.$on("reviseTicketOrderBoxOpen", function(GuestId,obj) {
+      $this.dialogTicketOrderVisibleName = "修改出票状态";
+      $this.GuestId = GuestId;
+      $this.obj = obj;
+      $this.dialogTicketOrderVisible = true;
+    });
     this.MsgBus.$on("closeTicketOrderDialogBox", function() {
       $this.dialogTicketOrderVisible = false;
       this.$emit("getList");