Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/customerManage/orderList.vue

@@ -63,7 +63,9 @@
                <p class="CreateByName-text">业务员：<span class="colorblue">{{item.EnterName}}</span></p>
                <p>{{item.CreateTime}}</p>
               </td>
-              <td style="border:none" min-width="6.5%">{{item.GuestName}}
+              <td style="border:none" min-width="6.5%">
+                  <p class="colorblue font-color-link" 
+                  @click="openNameDetails(item)">{{item.GuestName}}</p>
                   <p>{{item.MobilePhone}}</p>
               </td>
               <td style="border:none">{{item.GuestCount}}人</td>
@@ -213,14 +215,18 @@
         <!--取消订单-->
       </table>
     </div>
+    <el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose">
+        <customerInfoBox :CustomerId="CustomerId" />
+    </el-drawer>
 
   </div>
 </template>
 
 <script>
+  import customerInfoBox from "../guestManagement/customerInfoBox";
   export default {
     components: {
-      
+      customerInfoBox
     },
     props: {
       //订单
@@ -242,7 +248,10 @@
             {Name:'修改出票状态',Id:'4'},
             {Name:'操作日志',Id:'3'},
         ],
-        clickMore:''
+        clickMore:'',
+        drawer: false,
+        CustomerId:'',
+        CustomerName:''
       };
     },
     created() {
@@ -260,6 +269,14 @@
         this.userInfo = this.getLocalStorage();
     },
     methods: {
+      handleClose(done) {
+          done();
+      },
+      openNameDetails(item) {
+          this.drawer = true;
+          this.CustomerId = item.GuestId;
+          this.CustomerName = item.GuestName;
+      },
       // 查看出票凭据
       viewCredentials(row){
         let $this = this;

src/components/guestManagement/guestManagement.vue

@@ -10,7 +10,7 @@
         <div class="tools">
             <h1>直客管理</h1>
             <div style="width: 340px;">
-                <el-input placeholder="请输入直客名称/手机号" v-model="msg.GusetName" class="input-with-select">
+                <el-input placeholder="请输入直客名称/手机号" v-model="msg.KeyWord" class="input-with-select">
                     <el-button slot="append" icon="el-icon-search" @click="getList"></el-button>
                 </el-input>
             </div>
@@ -101,6 +101,19 @@
                 :height="sceneList.length > 0 ? '600' : '660'" border row-class-name="font-size-12"
                 @selection-change="handleSelectionChange">
                 <el-table-column fixed type="selection" width="40"></el-table-column>
+                <el-table-column label="状态" sortable v-if="queryType[36].show" width="100">
+                    <template slot-scope="scope">
+                        <span :style="{color:scope.row.TOrderState==2||scope.row.TOrderState==3?'#20B559':'#F95A5A'}">
+                            <i class="iconfont"
+                            :style="{color:scope.row.TOrderState==2||scope.row.TOrderState==3?'#20B559':'#F95A5A'}"
+                            :class="scope.row.TOrderState==1?'iconshibai':'iconchenggong'"></i>
+                            {{scope.row.TOrderState==1?"未成交":
+                            (scope.row.TOrderState==2?"成交":
+                            scope.row.TOrderState==3?"多次成交":
+                            '')}}
+                        </span>
+                    </template>
+                </el-table-column>
                 <el-table-column fixed prop="GusetName" label="客户名称" width="120" v-if="queryType[0].show"
                     show-overflow-tooltip>
                     <template slot-scope="scope">
@@ -135,13 +148,6 @@
                 <el-table-column prop="OrderMoney" label="交易金额" sortable v-if="queryType[25].show"
                     show-overflow-tooltip>
                 </el-table-column>
-                <el-table-column label="状态" sortable v-if="queryType[36].show" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        <span :style="{color:scope.row.TOrderState==1?'gray':(scope.row.TOrderState==2?'':'red')}">
-                            {{scope.row.TOrderState==1?"未成交":(scope.row.TOrderState==2?"成交":scope.row.TOrderState==3?"多次成交":'')}}
-                        </span>
-                    </template>
-                </el-table-column>
                 <el-table-column prop="BirthdayAddress" label="出生地点" sortable v-if="queryType[28].show"
                     show-overflow-tooltip>
                 </el-table-column>
@@ -530,7 +536,7 @@
                     EmpId: "",
                 },
                 msg: {
-                    GusetName: "",
+                    KeyWord: "",
                     pageIndex: 1,
                     pageSize: 30,
                     ContactNumber: "",