样式

2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -2,11 +2,7 @@
  <div class="app-container">
    <el-card>
      <span>客户名称：</span>
-<<<<<<< HEAD
      <el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin: 3px" size="small" clearable>
-=======
-      <el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin-right: 10px" size="small" clearable>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <el-option
          v-for="item in CustomerName"
          :key="item.value"
@@ -25,20 +21,11 @@
      <!--:value="item.value">-->
      <!--</el-option>-->
      <!--</el-select>-->
-<<<<<<< HEAD
      <el-button type="success" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" @click="selectCustomerOfName">查询</el-button>
    </el-card>
    <el-card>
      <el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
      <el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>
-=======
-      <el-button type="success" icon="el-icon-search" class="move" size="small" @click="selectCustomerOfName">查询</el-button>
-    </el-card>
-    <el-card>
-      <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
-      <span style="float: right">销售经理</span>
-      <el-table v-loading="loading3" :data="tableData3" height="192" size="mini" style="width: 100%;margin-top: 10px" border>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <!--<el-table-column label="责权省份" align="center" min-width="80">-->
        <!--<template slot-scope="scope">-->
        <!--{{ scope.row.省份 }}-->
@@ -64,7 +51,6 @@
            {{ scope.row.出生日期 }}
          </template>
        </el-table-column>
-<<<<<<< HEAD
        <el-table-column label="操作" align="center" width="100px" fixed="right">
          <template slot-scope="scope">
            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -86,37 +72,18 @@
                  @click="handleDeleteMarketingManager(scope.$index, scope.row)"/>
              </div>
            </el-tooltip>
-=======
-        <el-table-column label="操作" align="center" width="200px" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              class="el-icon-edit"
-              @click="handleEditMarketingManager(scope.row);flag = 2">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              class="el-icon-delete"
-              @click="handleDeleteMarketingManager(scope.$index, scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          </template>
        </el-table-column>
      </el-table>
    </el-card>
    <el-row>
-<<<<<<< HEAD
      <el-col :span="3">
-=======
-      <el-col :span="5">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <el-card>
          <el-table
            v-loading="loading1"
            ref="multipleTable"
            :data="tableData1"
            stripe
-<<<<<<< HEAD
            highlight-current-row
            tooltip-effect="dark"
            style="width: 100%; margin-top: 3px;"
@@ -124,23 +91,11 @@
            size="mini"
            border>
            <el-table-column align="center" label="序号" width="65">
-=======
-            tooltip-effect="dark"
-            style="width: 100%"
-            height="690"
-            size="mini"
-            border>
-            <el-table-column align="center" label="序号" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                <el-radio :label="scope.row.省份流水号" v-model="radio" @change="pageCurrent = 1;pageSize = 30;getCurrentRow(scope.row.省份流水号, scope.row.省份)"/>
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column align="center" label="地区" width="auto">
-=======
-            <el-table-column align="center" label="地区">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.省份 }}
              </template>
@@ -148,65 +103,36 @@
          </el-table>
        </el-card>
      </el-col>
-<<<<<<< HEAD
      <el-col :span="21">
        <el-card>
          <el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
          <el-table v-loading="loading2" :data="tableData2" highlight-current-row height="640" size="mini" stripe style="width: 100%;margin-top: 2px" border>
            <el-table-column label="客户名称" align="center" min-width="180" show-overflow-tooltip>
-=======
-      <el-col :span="19">
-        <el-card>
-          <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click = "addCustomer();flag1 = 1">新增客户</el-button>
-          <span style="float: right">客户信息</span>
-          <el-table v-loading="loading2" :data="tableData2" height="620" size="mini" style="width: 100%;margin-top: 10px" border>
-            <el-table-column label="客户名称" align="center" min-width="340">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.客户名称 }}
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column label="联系人" align="center" min-width="80" show-overflow-tooltip>
-=======
-            <el-table-column label="联系人" align="center" min-width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.联系人 }}
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column label="联系电话" align="center" min-width="100" show-overflow-tooltip>
-=======
-            <el-table-column label="联系电话" align="center" min-width="300">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.电话 }}
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column label="开票电话" align="center" min-width="100">
-=======
-            <el-table-column label="开票电话" align="center" min-width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.传真 }}
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column label="联系地址" align="center" min-width="150" show-overflow-tooltip>
-=======
-            <el-table-column label="联系地址" align="center" min-width="350">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.地址 }}
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column label="电子邮箱" align="center" min-width="150">
-=======
-            <el-table-column label="电子邮箱" align="center" min-width="250">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.电子邮箱 }}
              </template>
@@ -216,20 +142,12 @@
                {{ scope.row.税号 }}
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column label="开户行" align="center" min-width="140" show-overflow-tooltip>
-=======
-            <el-table-column label="开户行" align="center" min-width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.开户行 }}
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column label="银行账号" align="center" min-width="140">
-=======
-            <el-table-column label="银行账号" align="center" min-width="260">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.银行账号 }}
              </template>
@@ -239,16 +157,11 @@
                {{ scope.row.价值评估 }}
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column label="备注" align="center" show-overflow-tooltip>
-=======
-            <el-table-column label="备注" align="center" min-width="350">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.备注 }}
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column label="操作" align="center" min-width="100px" fixed="right">
              <template slot-scope="scope">
                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -270,20 +183,6 @@
                      @click="handleDelete(scope.$index, scope.row)"/>
                  </div>
                </el-tooltip>
-=======
-            <el-table-column label="操作" align="center" min-width="200px" fixed="right">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="primary"
-                  class="el-icon-edit"
-                  @click="handleEdit(scope.row);flag1 = 2">编辑</el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  class="el-icon-delete"
-                  @click="handleDelete(scope.$index, scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              </template>
            </el-table-column>
          </el-table>
@@ -325,11 +224,7 @@
            @node-click="handleNodeClick"
          />
        </div>
-<<<<<<< HEAD
        <el-table :data="ListPeople" height="400" stripe style="width: 400px;float: left;margin-left: 30px" size="mini" highlight-current-row @row-click="handleChange">
-=======
-        <el-table :data="ListPeople" height="400" style="width: 400px;float: left;margin-left: 30px" size="mini" highlight-current-row @row-click="handleChange">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <el-table-column label="考勤编号" align="center" >
            <template slot-scope="scope">
              {{ scope.row.考勤编号 }}
@@ -635,11 +530,7 @@ export default {
    },
    addMarketingManager() {
      this.dialogFormVisible1 = true
-<<<<<<< HEAD
      this.title1 = '新增营销经理'
-=======
-      this.title1 = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      this.addForm('form1')
    },
    callOff1() {
@@ -712,11 +603,7 @@ export default {
    },
    handleEditMarketingManager(row) {
      this.dialogFormVisible1 = true
-<<<<<<< HEAD
      this.title1 = '编辑营销经理'
-=======
-      this.title1 = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      this.form1.营销经理 = row.姓名
      this.peopleid = row.营销经理流水号
      this.a = row.营销经理地区流水号
@@ -727,11 +614,7 @@ export default {
        this.$message.warning('请选择一个省份')
      } else {
        this.dialogFormVisible2 = true
-<<<<<<< HEAD
        this.title2 = '新增客户'
-=======
-        this.title2 = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      }
      selectAdressOfID(this.AdressID).then(response => {
        this.form2.省份 = response.data[0].省份
@@ -742,11 +625,7 @@ export default {
    },
    handleEdit(row) {
      this.dialogFormVisible2 = true
-<<<<<<< HEAD
      this.title2 = '编辑客户'
-=======
-      this.title2 = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      this.form2.省份 = row.省份
      this.form2.客户名称 = row.客户名称
      this.form2.联系电话 = row.电话