商机

src/components/businessManagement/businessManagement.vue

@@ -21,14 +21,14 @@
                     <el-dropdown-item command="2"><i class="iconfont icontongxunlu"></i> 直客商机</el-dropdown-item>
                 </el-dropdown-menu>
             </el-dropdown>
-            <el-dropdown @command="handleCommand">
+            <!-- <el-dropdown @command="handleCommand">
                 <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 icondaochu"></i> 导入</el-dropdown-item>
                 </el-dropdown-menu>
-            </el-dropdown>
+            </el-dropdown> -->
         </div>
     </div>
     <div class="query-box" :style="{'padding-bottom': sceneList.length > 0 ? '0px' : '10px'}">
@@ -67,7 +67,7 @@
                     </el-popover>
                     
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="5">
                     <span class="font-size-12" style="padding-right: 10px">客户类型</span>
                     <el-select size="mini" v-model="msg.CustomerType" placeholder="请选择" @change="getList">
                         <el-option key="0" label="客户" :value="0"></el-option>
@@ -135,6 +135,16 @@
                     <p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.CustomerName}}</p>
                 </template>
             </el-table-column>
+            <el-table-column
+                prop=""
+                label="线路"
+                v-if="queryType[9].show"
+                show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <!-- <p  class="">{{ scope.row.LineName }}</p>
+                    <p  class="">{{ scope.row.LineteamName }}</p> -->
+                </template>
+            </el-table-column>
             <el-table-column
                 prop="BudgetPrice"
                 label="预算价格"
@@ -308,6 +318,12 @@
             <el-button class="add-box-btn add-box-cancel" @click="transferVisible = false">取 消</el-button>
         </div>
     </el-dialog>
+    <!-- 商机转移订单 -->
+    <div v-if="TraOrderShow">
+        <TraOrder :ID="businessIds" :EmployeeList="EmployeeList" 
+        @cancel="TraOrderShow=false"
+        @TraOrder="TraOrderShow=false"></TraOrder>
+    </div> 
   </div>
 </template>
 <script>
@@ -317,6 +333,7 @@ import customerDialogBox from "../dialogModel/customerDialogBox";
 import businessInfoBox from "./businessInfoBox";
 import addBusinessBox from "./addBusinessBox";
 import addTeamman from "./addTeamman";
+import TraOrder from "./TraOrder";
 export default {
     components: {
         mySelect,
@@ -324,7 +341,8 @@ export default {
         businessInfoBox,
         addBusinessBox,
         customerDialogBox,
-        addTeamman
+        addTeamman,
+        TraOrder
     },
     data() {
         return {
@@ -394,6 +412,10 @@ export default {
                 },{
                     label: '创建时间',
                     show: true,
+                },
+                {
+                    label: '系列',
+                    show: true,
                 }
             ],
             isGuest: false,
@@ -453,9 +475,13 @@ export default {
             ],
             selectionList: [
                 {
-                    name: '转移',
+                    name: '转移负责人',
                     class:'iconfont iconplus-transfer',
                     myFun: this.transfer
+                },{
+                    name: '转移订单',
+                    class:'iconfont iconplus-transfer',
+                    myFun: this.TransferOrder
                 },{
                     name: '删除',
                     class:'iconfont icondelete',
@@ -470,6 +496,7 @@ export default {
             SceneEmployeeList: [],
             sceneID: 24,
             visible: false,
+            TraOrderShow: false,
         };
     },
     mounted() {
@@ -569,6 +596,15 @@ export default {
           err => {}
         );
     },
+    //转移订单
+    TransferOrder(){
+        let str = ''
+        this.businessIdsArr.map((x, i)=>{
+            str = str + x + ','
+        })
+        this.businessIds = str.substring(0, str.length - 1)
+        this.TraOrderShow = true
+    },
     //添加团队成员
     addCust(){
         let str = ''

src/components/contractManagement/contractManagement.vue

@@ -40,12 +40,12 @@
         </div>
         <div class="query-box">
             <el-row v-if="!multipleSelection.length" :gutter="30">
-                <el-col :span="4">
+                <el-col :span="5">
                     <span class="font-size-12" style="padding-right: 10px">合同编号</span>
                     <el-input size="mini" class="w210" v-model="msg.T_ContractNum" placeholder="请输入合同编号"
                         @keyup.enter.native="getList"></el-input>
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="5">
                     <span class="font-size-12" style="padding-right: 10px">合同类型</span>
                     <el-select size="mini" v-model="msg.CType" @change="getList">
                         <el-option label="不限" :value="0" :key="0"> </el-option>
@@ -54,12 +54,12 @@
                         <el-option label="一日游合同" :value="3" :key="3"> </el-option>
                     </el-select>
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="5">
                     <span class="font-size-12" style="padding-right: 10px">甲方名称</span>
                     <el-input size="mini" class="w210" v-model="msg.Tourists_Name" placeholder="请输入客户名称"
                         @keyup.enter.native="getList"></el-input>
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="5">
                     <span class="font-size-12" style="padding-right: 10px">客户电话</span>
                     <el-input size="mini" class="w210" v-model="msg.Tourists_Tel" placeholder="请输入客户电话"
                         @keyup.enter.native="getList"></el-input>

src/components/dev/payroll.vue

 <template>
     <div class="payroll-box">
         <div class="tools">
-            <!-- <h1>订单管理</h1> -->
+            <h1>工资单</h1>
             <div class="rightmenu">
+                &nbsp;
                 <!-- <el-button size="mini" type="primary" @click="downLoadExcel">导出</el-button> -->
             </div>
         </div>