他人版本解决冲突

src/components/HomeNav/HomeNavLeft.vue

@@ -108,21 +108,28 @@
         :default-active="$route.path">
         <template v-for="(item,index) in navList">
           <template v-if="item.GCode!='默认'">
-            <el-submenu :index="item.list[0].MenuUrl?item.list[0].MenuUrl:index">
+            <el-submenu :index="item.list&&item.list.length>0&&item.list[0].MenuUrl?item.list[0].MenuUrl:String(index)">
               <template slot="title">
-                <i class="iconfont iconText"></i>
                 <span>{{ item.GCode }}</span>
               </template>
               <el-menu-item-group>
                 <el-menu-item :index="Child.MenuUrl" v-for="(Child,i) in item.list" :route="{path:Child.MenuUrl}"
-                >{{ Child.MenuName }}</el-menu-item>
+                >
+                <i class="iconfont iconText"
+                :class="[Child.MenuStyle.icon]"></i>
+                <span>{{ Child.MenuName }}</span>
+              </el-menu-item>
               </el-menu-item-group>
             </el-submenu>
           </template>
           <template v-else>
             <template v-for="(Child,i) in item.list">
               <el-menu-item :index="Child.MenuUrl" @click="goUrl(Child)"
-                >{{ Child.MenuName }}</el-menu-item>
+                >
+                <i class="iconfont iconText"
+                :class="[Child.MenuStyle.icon]"></i>
+                <span>{{ Child.MenuName }}</span>
+              </el-menu-item>
             </template>
           </template>
         </template>
@@ -216,15 +223,6 @@
       this.MsgBus.$on("setLeftNav", function (val) {
         $this.activeIndex = 0;
         if (userInfo && userInfo.UserMenu && userInfo.UserMenu.length > 0) {
-          for(let i=0;i<userInfo.UserMenu.length;i++){
-            for(let j=0;j<userInfo.UserMenu[i].ChildMenu.length;j++){
-              for(let z=0;z<userInfo.UserMenu[i].ChildMenu[j].NewChildMenu.length;z++){
-                for(let y=0;y<userInfo.UserMenu[i].ChildMenu[j].NewChildMenu[z].list.length;y++){
-                  console.log(userInfo.UserMenu[i].ChildMenu[j].NewChildMenu[z].list)
-                }
-              }
-            }
-          }
           $this.navList = userInfo.UserMenu[0].ChildMenu[val].NewChildMenu;
         }
       });

src/components/assembly/TeamMembers.vue

@@ -21,7 +21,7 @@
         style="width: 100%"
         @selection-change="handleSelectionChange"
         row-class-name="font-size-12">
-        <el-table-column :selectable='checkboxT' fixed type="selection" width="40"></el-table-column>
+        <el-table-column :selectable='checkboxT' fixed type="selection" width="50"></el-table-column>
         <el-table-column 
             prop="EmpName"
             label="销售名称"

src/components/businessManagement/TeamMembers.vue

@@ -21,7 +21,7 @@
         style="width: 100%"
         @selection-change="handleSelectionChange"
         row-class-name="font-size-12">
-        <el-table-column :selectable='checkboxT' fixed type="selection" width="40"></el-table-column>
+        <el-table-column :selectable='checkboxT' fixed type="selection" width="50"></el-table-column>
         <el-table-column 
             prop="EmpName"
             label="销售名称"

src/components/businessManagement/businessInfoBox.vue

@@ -180,14 +180,14 @@
             <div class="right">
                 <el-button class="crm-btn query-btn" @click="editCustbusiness" v-if="detailsData.IsRead === 0">编辑</el-button>
                 <el-button class="crm-btn easy-btn iconfont iconplus-transfer " v-if="detailsData.IsRead === 0">转移</el-button>
-                <el-dropdown @command="handleCommand" style="top: 1px;" v-if="detailsData.IsRead === 0">
+                <!-- <el-dropdown @command="handleCommand" style="top: 1px;" v-if="detailsData.IsRead === 0">
                     <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
                         <i class="iconfont icongengduo"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item command="d"><i class="iconfont icondelete"></i> 删除</el-dropdown-item>
                     </el-dropdown-menu>
-                </el-dropdown>
+                </el-dropdown> -->
             </div>
         </div>
         <div class="drawer-body">

src/components/businessManagement/businessManagement.vue

@@ -141,8 +141,8 @@
                 v-if="queryType[9].show"
                 show-overflow-tooltip>
                 <template slot-scope="scope">
-                    <!-- <p  class="">{{ scope.row.LineName }}</p>
-                    <p  class="">{{ scope.row.LineteamName }}</p> -->
+                    <p  class="" v-if="scope.row.LineName">{{ scope.row.LineName }}</p>
+                    <p  class="" v-if="scope.row.LineTeamName">{{ scope.row.LineTeamName }}</p>
                 </template>
             </el-table-column>
             <el-table-column
@@ -482,11 +482,13 @@ export default {
                     name: '转移订单',
                     class:'iconfont iconplus-transfer',
                     myFun: this.TransferOrder
-                },{
-                    name: '删除',
-                    class:'iconfont icondelete',
-                    myFun: this.delete
-                },{
+                },
+                // {
+                //     name: '删除',
+                //     class:'iconfont icondelete',
+                //     myFun: this.delete
+                // },
+                {
                     name: '添加团队成员',
                     class:'iconfont icontianjia',
                     myFun: this.addCust
@@ -598,6 +600,7 @@ export default {
     },
     //转移订单
     TransferOrder(){
+        return
         let str = ''
         this.businessIdsArr.map((x, i)=>{
             str = str + x + ','

src/components/guestManagement/guestTeam.vue

@@ -15,7 +15,7 @@
     </div>
     <el-table v-loading="loading" stripe ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%"
       @selection-change="handleSelectionChange" row-class-name="font-size-12">
-      <el-table-column :selectable='checkboxT' fixed type="selection" width="40"></el-table-column>
+      <el-table-column :selectable='checkboxT' fixed type="selection" width="50"></el-table-column>
       <el-table-column prop="EmployeeName" label="销售名称" show-overflow-tooltip>
       </el-table-column>
       <el-table-column prop="PostName" label="岗位" show-overflow-tooltip>

src/plugins/domainManager.js

@@ -3,9 +3,13 @@ const isOnline = function () {
 }
 export default function () {
     //CRM API
-    let domainUrl = "http://192.168.5.56:5003";
+    let domainUrl = "";
+    // domainUrl = "http://192.168.5.46:5003";
+    domainUrl = "http://192.168.5.56:8032";
     //旅游ERPApi
-    let erpApiUrl = "http://192.168.5.56"
+    let erpApiUrl = ""
+    // erpApiUrl = "http://192.168.5.46"
+    erpApiUrl = "http://192.168.5.56"
     let erpSiteUrl = "";//ERP前端域名
     let javaUrl="http://192.168.10.215:9000";//javaapi域名获取优惠卷
     let ViittoFileUrl="http://192.168.5.214:8130";//文件预览站点