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

# Conflicts:
#	src/components/guestManagement/guestManagement.vue

src/components/clueManagement/clueManagement.vue

@@ -61,6 +61,7 @@
                                 </div>
                             </div>
                         </div>
+                 
                         <el-select size="mini" popper-class="select-no" slot="reference" v-model="msg.ID"
                             placeholder="请选择">
                             <el-option v-for="item in SceneEmployeeList" :key="item.ID" :label="item.SceneName"
@@ -197,12 +198,12 @@
         <el-drawer :with-header="false" size='70%' :visible.sync="isShowCustomerInfo" direction="rtl"
             :before-close="handleClose">
             <customerInfoBox :CustomerId="CustomerId" @transferS="transfer" @deleteClue="deleteClue" @watersS="waters"
-                @editCustS="editCust"  @getList="getList" />
+                @editCustS="editCust" @getList="getList" />
         </el-drawer>
         <el-drawer :with-header="false" size='70%' :visible.sync="isShowGuestInfo" direction="rtl"
             :before-close="handleClose">
             <guestInfoBox :CustomerId="CustomerId" @transferS="transfer" @deleteClue="deleteClue" @watersS="waters"
-                @editCustS="editCust" @getList="getList"  />
+                @editCustS="editCust" @getList="getList" />
         </el-drawer>
         <div v-if="dialogTableVisible">
             <customerDialogBox @getList="getList" :name="dialogTableVisibleName" :CustomerId="CustomerId" />
@@ -360,25 +361,9 @@
                     WhereType: -1,
                     OrderBy: '',
                     CustomerType: 1,
-                    ID: 29,
+                    ID: 33,
                 },
                 total: 0,
-                WhereTypeList: [{
-                    id: -1,
-                    name: '全部'
-                }, {
-                    id: 1,
-                    name: '我负责的'
-                }, {
-                    id: 2,
-                    name: '下属的'
-                }, {
-                    id: 3,
-                    name: '我参与的'
-                }, {
-                    id: 4,
-                    name: '我关注的'
-                }, ],
                 selectionList: [{
                     name: '转移',
                     class: 'iconfont iconplus-transfer',
@@ -394,7 +379,7 @@
                 }],
                 sceneList: [],
                 SceneEmployeeList: [],
-                sceneID: 29,
+                sceneID: 33,
                 visible: false,
                 isShowImport: false, //是否显示导入弹窗
                 importType: 1, //导入文件类型(1-客户导入,2-直客导入)

src/components/guestManagement/Agreement.vue

@@ -517,7 +517,6 @@ export default {
       
     },
     openDetails(scope) {
-      console.log(scope.row.ID);
       this.MsgBus.$emit("busnessDrawerShow", scope.row.ID, 1);
     },
     // 获取出票状态枚举

src/components/guestManagement/guestManagement.vue

@@ -64,7 +64,8 @@
                     <div style="display: flex;flex-direction: row;align-items: center;">
                         <span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">状态：</span>
                         <el-select size="mini" width="100" v-model="msg.Q_TOrderState" @change="getList">
-                            <el-option v-for="(item,index) in transactionStatusList" :key="index" :label="item.Name" :value="item.Id"> </el-option>
+                            <el-option v-for="(item,index) in transactionStatusList" :key="index" :label="item.Name"
+                                :value="item.Id"> </el-option>
                         </el-select>
                     </div>
                 </el-col>
@@ -125,7 +126,8 @@
                 </el-table-column>
                 <el-table-column prop="TOrderNum" label="机票数" sortable v-if="queryType[34].show" show-overflow-tooltip>
                 </el-table-column>
-                <el-table-column prop="TOrderMoney" label="机票金额" sortable v-if="queryType[35].show" show-overflow-tooltip>
+                <el-table-column prop="TOrderMoney" label="机票金额" sortable v-if="queryType[35].show"
+                    show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column prop="OrderCount" label="订单交易数" sortable v-if="queryType[24].show"
                     show-overflow-tooltip>
@@ -284,11 +286,22 @@
         },
         data() {
             return {
-                transactionStatusList:[
-                    {Name:"全部",Id:"0"},
-                    {Name:"未成交",Id:"1"},
-                    {Name:"成交",Id:"2"},
-                    {Name:"多次成交",Id:"3"},
+                transactionStatusList: [{
+                        Name: "全部",
+                        Id: "0"
+                    },
+                    {
+                        Name: "未成交",
+                        Id: "1"
+                    },
+                    {
+                        Name: "成交",
+                        Id: "2"
+                    },
+                    {
+                        Name: "多次成交",
+                        Id: "3"
+                    },
                 ],
                 ruleList: [],
                 queryType2: [{
@@ -496,7 +509,7 @@
                 }, {
                     label: "状态",
                     show: true,
-                },],
+                }, ],
                 CustomerId: 0,
                 CustomerIdStr: "",
                 transferVisible: false,
@@ -553,15 +566,19 @@
                 visible: false,
             };
         },
+        created() {
+            this.GetSceneEmployeeList();
+            this.Employee();
+        },
         mounted() {
             this.userInfo = this.getLocalStorage();
             this.getList();
-            this.Employee();
+
             let $this = this;
             this.MsgBus.$on("closeCustomerDialogBox", function () {
                 $this.dialogTableVisible = false;
             });
-            this.GetSceneEmployeeList();
+
             //保存场景
             this.MsgBus.$on("sceneSave", function (msg) {
                 $this.sceneList = [...msg];