no message

src/components/customerManage/orderDetailsDrawer.vue

@@ -113,7 +113,7 @@
                           <productDetails :detailsData="detailsData"></productDetails>
                         </el-tab-pane>
                         <el-tab-pane label="订单核算" name="2">
-                            <orderProfits :orderId="orderId"></orderProfits>
+                            <orderProfits :orderId="orderId" :GuestId="detailsData.GuestId"></orderProfits>
                         </el-tab-pane>
                         <el-tab-pane label="订单日志" name="3">
                             <orderLog :orderId="orderId"></orderLog>

src/components/customerManage/orderList.vue

@@ -1480,9 +1480,11 @@ li {
   cursor: pointer;
 }
 .OrderId-text .text-underline{
-    text-decoration: underline;
     margin-right: 5px;
-} 
+}
+.OrderId-text .text-underline:hover{
+    text-decoration: underline;
+}
 
 .CreateByName-text {
   margin-bottom: 10px;

src/components/customerManage/orderProfits.vue

@@ -165,12 +165,15 @@
       </div>
       <div class="Team_collection" v-if="d">
         <div class="clearfix TB_PrintDiv">
-          <div class="TB_comtitle TB-Title">其他收入
-            <span>
-              <span class="span_all">应收：¥{{d.OtherYS}}</span>
-              <span class="span_all">实收：¥{{d.OtherSS}}</span>
-            </span>
+          <div class="TB_comtitle TB-Title">
+            <div>其他收入
+              <span>
+                <span class="span_all">应收：¥{{d.OtherYS}}</span>
+                <span class="span_all">实收：¥{{d.OtherSS}}</span>
+              </span>
+            </div>
           </div>
+          <el-button style="float: right;" size="mini" type="primary" @click="makeAdocument(d,1)">制单</el-button>
         </div>
         <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
           <tr>
@@ -281,6 +284,7 @@
               <span class="span_all">实付：¥{{d.OtherSF}}</span>
             </span>
           </div>
+          <el-button style="float: right;" size="mini" type="primary" @click="makeAdocument(d,3)">制单</el-button>
         </div>
         <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
           <tr>
@@ -388,14 +392,16 @@
 
 <script>
 export default {
-  props: ["orderId"],
+  props: ["orderId","GuestId"],
   data() {
     return {
       loading: true,
       d: null,
+      userInfo:{}
     };
   },
   mounted() {
+    this.userInfo = this.getLocalStorage();
     this.init();
   },
   methods: {
@@ -450,6 +456,54 @@ export default {
         return this.d.FinanceList.filter((x) => x.ReFinanceId2 == 2);
       }
     },
+    // 制作单据
+    makeAdocument(row, num) {
+      this.makeAdocumentFun(row, num);
+    },
+    makeAdocumentFun(row, num) {
+      let type;
+      type = num == 1 ? 1 : 2; // 1收款 2退款 3成本
+      let href;
+      let url = this.domainManager().erpRoutingUrl;
+      let data;
+      if (this.userInfo.EmName == row.EnterName) {
+        if (row.OrderStatus != "2") {
+            if (num == '1' || num == '3') {
+              data = [
+                {
+                  path: "ChoiceAddFinancialDocuments",
+                  type: type,
+                  OtherType: 55,
+                  ReFinanceId: this.orderId,
+                  ReFinanceId2: num,
+                  GuestId: this.GuestId,
+                  RelevanceFrId: 5, // 单据类型 5其他
+                },
+              ];
+            }
+            if (num == '2') {
+              data = [
+                {
+                  path: "ChoiceAddFinancialDocuments",
+                  type: type,
+                  OtherType: 55,
+                  ReFinanceId: this.orderId,
+                  ReFinanceId2: num,
+                  GuestId: this.GuestId,
+                },
+              ];
+            }
+            href =
+              url +
+              "automaticLogin?token=" +
+              this.getLocalStorage().token +
+              "&data=" +
+              JSON.stringify(data);
+             window.open(href);
+          
+        }
+      }
+    },
   },
 };
 </script>
@@ -497,12 +551,14 @@ export default {
 .singeRowTable tr th {
   height: 30px;
   text-align: left !important;
+  padding-left: 12px !important;
 }
 
 .singeRowTable tr td {
   border: 1px solid #e5e5e5;
   padding: 0px !important;
   padding-left: 12px !important;
+  font-size: 13px;
 }
 
 /* .Team_Content .el-col-5 {
@@ -523,6 +579,10 @@ export default {
   position: relative;
   top: 10px;
 }
+.TB-Title.B-Title-fr{
+  display: flex;
+  justify-content: space-between;
+}
 
 .Team_ComCoin {
   width: 60%;
@@ -536,6 +596,12 @@ export default {
 
 .Team_collection {
   margin-top: 40px;
+  display: flex;
+  flex-direction: column;
+}
+.Team_collection tr th{
+  border: 1px solid #e5e5e5;
+  font-size: 14px;
 }
 
 .Team_outCome {

src/components/guestManagement/Agreement.vue

-<style scoped>
+<style>
     .add-Enclosure {
         display: flex;
         justify-content: space-between;
@@ -116,13 +116,36 @@
     /deep/.el-table .cell.el-tooltip{
         overflow: hidden !important;
     }
+    .OrderType-text-box{
+        word-break: break-word;
+        word-wrap: break-word;
+        white-space: -moz-pre-wrap;
+        white-space: -hp-pre-wrap;
+        white-space: -o-pre-wrap;
+        white-space: -pre-wrap;
+        white-space: pre;
+        white-space: pre-wrap;
+        white-space: pre-line; 
+    }
+    .OrderType-text-box .text-underline{
+        font-size: 19px;
+        color: rgb(41, 97, 254);
+        margin-right: 10px;
+        font-weight: bold;
+        display: inline;
+        cursor: pointer;
+    }
+    .OrderType-text-box .text-underline:hover{
+        text-decoration: underline;
+    }
     .OrderType-text{
-        font-size: 11px;
+        font-size: 10px;
         font-weight: 100;
         margin-left: 5px;
         border-radius: 3px;
         display: inline-block;
         padding: 0 1px;
+        margin-bottom: 2px;
     }
     .OrderType-text-box .OrderType-text:nth-child(2){
         margin-left: 0;
@@ -192,8 +215,8 @@
             fixed
             label="订单号" width="110">
             <template slot-scope="scope">
-                <div class="OrderType-text-box">
-                    <p>{{scope.row.OrderId}}</p>
+                <div class="OrderType-text-box" @click="clickSingleNumber(scope.row)">
+                    <span class="text-underline">{{scope.row.OrderId}}</span>
                     <span class="OrderType-text"
                         :class="items.Id==1?'one':(items.Id==2?'two':(items.Id==3?'three':(items.Id==4?'four':(items.Id==5?'five':''))))"
                         v-for="(items,index) in scope.row.MultipleChoiceList">{{items.Name}}</span>
@@ -372,10 +395,18 @@
         <el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[10, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total">
         </el-pagination>
     </div>
+    <!-- 单号抽屉 -->
+    <el-drawer  @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :append-to-body="true" :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
+        <orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" />
+    </el-drawer>
     </div>
 </template>
 <script>
+    import orderDetailsDrawer from "../customerManage/orderDetailsDrawer";
     export default {
+        components: {
+            orderDetailsDrawer
+        },
         props: ["ID", "BusinessType"],
         data() {
             return {
@@ -430,7 +461,9 @@
                     EnterID: "",
                     userInfo: {}
                 },
-                total: 0
+                total: 0,
+                currentOrder: null,
+                orderDrawer:false,
             };
         },
         watch: {
@@ -459,6 +492,18 @@
             });
         },
         methods: {
+            // 点击单号
+            clickSingleNumber(item) {
+                this.currentOrder = item;
+                this.orderDrawer = true;
+            },
+            closeOrderDrawerHandler() {
+                this.currentOrder = null;
+                this.orderDrawer = false;
+            },
+            handleClose(done) {
+                done();
+            },
             // 取消
             popCancelClick(row, index, num){
                 this.dataList.forEach(item=>{