no message

src/components/guestManagement/Agreement.vue

@@ -6,7 +6,7 @@
 .add-Enclosure-left{
   display: flex;
 }
-.tem-but-box{
+.item-but-box{
   display: flex;
 }
 .item-but{
@@ -29,13 +29,20 @@
 .tatusText.Black{
   color: Black;
 }
+.ToBeReceived.red{
+  color: #fd397a;
+}
+.ToBeReceived.blue{
+  color: #409eff;
+}
 </style>
 <template>
     <div class="Business">
       <div class="add-Enclosure">
         <el-row :gutter="12">
           <el-col :span="8">
-            <el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID" @blur="getList"></el-input>
+            <el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID" 
+            @keyup.enter.native="getList"></el-input>
           </el-col>
           <el-col :span="4">
             <el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择" 
@@ -71,21 +78,22 @@
             label="下单人"
             show-overflow-tooltip>
         </el-table-column>
-        
         <el-table-column
             fixed
-            label="订单号"
+            label="业务员"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.OrderId}}
-              <!-- <p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.OrderId}}</p> -->
+              <p>{{scope.row.EnterName}}</p>
+              <p>{{scope.row.CreateTime}}</p>
             </template>
         </el-table-column>
-        <el-table-column 
-            label="订单状态"
+        <el-table-column
+            fixed
+            label="订单号"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.OrderStatus==1?"正常":"取消"}}
+              {{scope.row.OrderId}}
+              <!-- <p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.OrderId}}</p> -->
             </template>
         </el-table-column>
         <el-table-column 
@@ -104,22 +112,15 @@
             label="订单金额"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              <p @click="editOrderAmount(scope.row)" class="font-color-link cp">{{scope.row.Money}}</p>
+              <p @click="editOrderAmount(scope.row)" class="cp"
+              :class="scope.row.TicketStatus==1&&scope.row.OrderStatus==1?'font-color-link':''">{{scope.row.Money}}</p>
             </template>
         </el-table-column>
         <el-table-column 
             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>
+              {{scope.row.IncomeMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,1)" class="iconfont iconjia- numIcon"></i>
             </template>
         </el-table-column>
         <el-table-column 
@@ -127,38 +128,37 @@
             label="退款"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.BackMoney}}<i class="iconfont iconjia- numIcon"></i>
+              {{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i>
             </template>
         </el-table-column>
         <el-table-column
-            prop="TaxMoney"
-            label="手续费"
-            show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column
-            prop="DueinMoney"
-            label="待收"
-            show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column
-            prop=""
             label="成本"
             show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
+            </template>
         </el-table-column>
-        <el-table-column
-            prop="PayFinance"
-            label="付款单据"
+        <el-table-column 
+            prop="PayMoney"
+            label="付款"
             show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.PayMoney}}
+            </template>
         </el-table-column>
         <el-table-column
-            prop="IncomeFinance"
-            label="收入单据"
+            prop="TaxMoney"
+            label="手续费"
             show-overflow-tooltip>
         </el-table-column>
         <el-table-column
-            prop="BackFinance"
-            label="退款单据"
+            label="待收"
             show-overflow-tooltip>
+            <template slot-scope="scope">
+              <p class="ToBeReceived" :class="scope.row.DueinMoney==0?'blue':'red'">
+                {{scope.row.DueinMoney}}
+              </p>
+            </template>
         </el-table-column>
         <el-table-column
             label="出票状态"
@@ -174,19 +174,31 @@
               </p>
             </template>
         </el-table-column>
+        <el-table-column 
+            label="订单状态"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.OrderStatus==1?"正常":"取消"}}
+            </template>
+        </el-table-column>
         <el-table-column
             prop="Remark"
             label="客户需求"
             show-overflow-tooltip>
         </el-table-column>
         <el-table-column
-            prop="EnterName"
-            label="业务员"
+            prop="PayFinance"
+            label="付款单据"
+            show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column
+            prop="IncomeFinance"
+            label="收入单据"
             show-overflow-tooltip>
         </el-table-column>
         <el-table-column
-            prop="CreateTime"
-            label="下单时间"
+            prop="BackFinance"
+            label="退款单据"
             show-overflow-tooltip>
         </el-table-column>
         <el-table-column
@@ -200,20 +212,22 @@
                    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> -->
+                  <el-tooltip
+                  class="item-but" effect="dark" content="操作日志" placement="top">
+                    <i class="iconfont iconcopy cp" @click="operationLog(scope.row)"></i>
+                  </el-tooltip>
+                  
                 </div>
             </template>
         </el-table-column>
       </el-table>
       </div>
       <div v-if="total>0">
-            <el-pagination class="Mypagination" background @current-change="handleCurrentChange"
-                :page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="sizes, prev, pager, next"
-                @size-change="handleSizeChange" :total="total">
-            </el-pagination>
-        </div>
+          <el-pagination class="Mypagination" background @current-change="handleCurrentChange"
+              :page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="sizes, prev, pager, next"
+              @size-change="handleSizeChange" :total="total">
+          </el-pagination>
+      </div>
     </div>
 </template>
 <script>
@@ -230,7 +244,7 @@ export default {
       loading: false,
       msg: {
         pageIndex: 1,
-        pageSize: 10,
+        pageSize: 30,
         OrderId:"",
         GuestId:"",
         TicketStatus: '0',
@@ -260,6 +274,15 @@ export default {
     });
   },
   methods: {
+    // 制作单据
+    makeAdocument(row,type){
+
+    },
+    // 操作日志
+    operationLog(row){
+      let $this = this;
+      this.MsgBus.$emit("logTicketOrderBoxOpen", $this.ID, row, true);
+    },
     // 修改出票状态
     modifyStatus(row){
       if(row.OrderStatus==2){

src/components/guestManagement/ticketOrder.vue

@@ -142,6 +142,43 @@
   height: 100px;
   margin-right: 10px;
 }
+.form-box-log{
+  border-left: 1px solid #E9E9E9;
+}
+.form-log-title{
+  width: 100%;
+  position: relative;
+}
+.form-log-text{
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+.form-log-text span:first-child{
+  color: #409efe;
+  font-size: 15px;
+}
+.form-log-text span:last-child{
+  color: #555;
+}
+.form-log-text,.form-log-center{
+  padding: 0 0 0 20px;
+}
+.log-radius{
+    position:absolute;
+    width: 5px;
+    height: 5px;
+    left: -3px;
+    border-radius: 100%;
+    top: 15px;
+    background: rgba(255, 164, 117, 1);
+    border-radius: 50%;
+    margin-right: 10px;
+}
+.form-log-center{
+  margin-bottom: 20px;
+  letter-spacing: 2px;
+}
 </style>
 <template>
     <el-dialog :visible.sync="dialogTableVisible" @closed="closedDialog" :close-on-click-modal="false" class="add-box add-box1 customerDialogBox">
@@ -151,7 +188,7 @@
         </div>
         <div class="form-box" v-if="show">
             <el-form :model="form" ref="form" class="MyEditForm" :rules="rules">
-                <p class="form-box-tit"><span class="radius"></span>
+                <p class="form-box-tit" v-if="name!='操作日志'"><span class="radius"></span>
                 {{name!='修改出票状态'?' 基本信息':' 上传'+text+'凭证'}}</p>
                 <el-row :gutter="30" v-if="name=='新建机票订单'">
                   <el-col :span="8">
@@ -177,7 +214,7 @@
                     </el-col>
                     
                 </el-row>
-                 <el-row :gutter="30" v-if="name!='修改出票状态'">
+                 <el-row :gutter="30" v-if="name=='新建机票订单'||name=='编辑订单金额'">
                      <el-col :span="8">
                         <div class="MyEditForm-item">
                             <el-form-item label="报价金额" prop="Money">
@@ -251,6 +288,33 @@
                   </el-col>
                 </el-row>
             </el-form>
+            <div v-if="name=='操作日志'">
+              <div v-for="(item,index) in logData" :key="index">
+                <div class="form-box-log">
+                  <div class="form-log-title">
+                    <span class="log-radius"></span>
+                    <div class="form-log-text">
+                      <span>
+                        {{item.CreateByName}}
+                      </span>
+                      <span>
+                        {{item.CreateTime}}
+                      </span>
+                    </div>
+                  </div>
+                  <div class="form-log-center">
+                    {{item.LogContent}}
+                  </div>
+                </div>
+              </div>
+            </div>
+            
+            <div v-if="total>0">
+              <el-pagination class="Mypagination" background @current-change="handleCurrentChange"
+                  :page-sizes="[10, 20, 60, 90, 100]" :page-size="msg.pageSize" layout="sizes, prev, pager, next"
+                  @size-change="handleSizeChange" :total="total">
+              </el-pagination>
+          </div>
         </div>
         <div slot="footer" class="dialog-footer">
             <el-button type="primary" class="add-box-btn" @click="submitForm('form')">确 定</el-button>
@@ -288,6 +352,13 @@ export default {
   },
   data() {
     return {
+      logData:[],
+      total:0,
+      msg:{
+        pageIndex: 1,
+        pageSize: 10,
+        OrderId:"",
+      },
       Voucher:[],
       fileList:[],
       radioList:[
@@ -352,12 +423,21 @@ export default {
       },
       deep: true,
     },
+    obj:{
+      handler(val, oldVal) {
+        this.getList()
+      },
+      deep: true,
+    }
   },
   mounted() { 
     this.form.GuestId = this.GuestId
     if(this.obj.TicketStatus==1){
       this.text = '出票'
     }
+    if(this.name=='操作日志'){
+      this.getList()
+    }
     let $this = this;
     setTimeout(() => {
       $this.dialogTableVisible = true;
@@ -367,6 +447,21 @@ export default {
     closedDialog() {
       this.MsgBus.$emit("closeTicketOrderDialogBox");
     },
+    // 操作日志
+    getList(){
+      if(this.name=='操作日志'){
+        this.msg.OrderId = this.obj.OrderId
+        
+      }
+      this.apipost("/api/Order/GetOrderLogPageList", this.msg, (res) => {
+        if (res.data.resultCode == 1) {
+          this.logData = res.data.data.pageData
+          this.total = res.data.data.count
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
+    },
     //上传文件后清空文件队列
     handleAvatarSuccess(res, file) {
       this.$refs.ticketUpload.clearFiles();
@@ -495,9 +590,14 @@ export default {
           }
         });
       }
+      if(this.name=='操作日志'){
+        this.dialogTableVisible = false;
+        this.MsgBus.$emit("closeTicketOrderDialogBox");
+      }
       
     },
     resetForm(formName) {
+      this.dialogTableVisible = false;
       this.MsgBus.$emit("closeTicketOrderDialogBox");
       // 重置表单
       this.form = {
@@ -511,6 +611,14 @@ export default {
       };
       this.$refs[formName].resetFields();
     },
+    handleSizeChange(val) {
+        this.msg.pageSize = val;
+        this.getList();
+    },
+    handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+    },
   },
 };
 </script>

src/views/index.vue

@@ -336,6 +336,12 @@ export default {
       $this.obj = obj;
       $this.dialogTicketOrderVisible = true;
     });
+    this.MsgBus.$on("logTicketOrderBoxOpen", 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");