修改直客相关页面、修改线索相关页面

src/components/assembly/Activity.vue

@@ -365,10 +365,10 @@
                   <span>附件</span>
                 </div>
               </el-upload>
-              <div class="ctrl-btn">
+              <!-- <div class="ctrl-btn">
                 <i class="iconfont iconguanlianbg"></i>
                 <span>关联商机</span>
-              </div>
+              </div> -->
               <!-- <div>
                 <i class="iconfont iconkehu"></i>
                 <span>关联联系人</span>

src/components/businessManagement/Activity.vue

@@ -362,10 +362,10 @@
                   <span>附件</span>
                 </div>
               </el-upload>
-              <div class="ctrl-btn" v-show="false">
+              <!-- <div class="ctrl-btn" v-show="false">
                 <i class="iconfont iconguanlianbg"></i>
                 <span>关联商机</span>
-              </div>
+              </div> -->
               <!-- <div>
                 <i class="iconfont iconkehu"></i>
                 <span>关联联系人</span>

src/components/businessManagement/businessManagement.vue

@@ -15,12 +15,12 @@
         </div>
         <div class="rightmenu">
             <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="BusinessId = 0, dialogBusinessVisibleName = '新建商机', dialogBusinessVisible=true">新建商机</el-button>
-            <el-dropdown>
+            <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><i class="iconfont icondaochu"></i> 导出</el-dropdown-item>
+                    <el-dropdown-item command="1"><i class="iconfont icondaochu"></i> 导入</el-dropdown-item>
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
@@ -491,6 +491,9 @@ export default {
         this.MsgBus.$off('editScene');
     },
   methods: {
+      handleCommand(command){
+            this.$message.warning('功能正在开发中~');
+        },
     changeWhere(item){
         this.msg.ID = item.ID
         this.sceneID = item.ID

src/components/clueManagement/clueManagement.vue

@@ -46,13 +46,13 @@
                     <el-dropdown-item command="2"><i class="iconfont icontongxunlu"></i> 直客线索</el-dropdown-item>
                 </el-dropdown-menu>
             </el-dropdown>
-            <el-dropdown>
+            <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><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
-                    <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item>
+                    <el-dropdown-item  command="3"><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
+                    <!-- <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> -->
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
@@ -159,7 +159,7 @@
                 label="客户级别"
                 sortable
                 width="100"
-                v-if="queryType[5].show"
+                v-if="queryType[5].show && msg.CustomerType === 0"
                 show-overflow-tooltip>
             </el-table-column>
             <el-table-column
@@ -514,8 +514,10 @@ export default {
         if (command === '1') {
             this.dialogTableVisibleName = '新建线索'
             this.dialogTableVisible = true
-        } else {
+        } else if (command === '2') {
             this.guestDialogBoxShow = true
+        } else if (command === '3') {
+            this.$message.warning('功能正在开发中~');
         }
     },
     Employee(){

src/components/contactsManagement/contactsManagement.vue

@@ -15,12 +15,12 @@
         </div>
         <div class="rightmenu">
             <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="BusinessId = 0, dialogBusinessVisibleName = '新建联系人', dialogBusinessVisible=true">新建联系人</el-button>
-            <el-dropdown>
+            <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><i class="iconfont icondaochu"></i> 导出</el-dropdown-item>
+                    <el-dropdown-item command="1"><i class="iconfont icondaochu"></i> 导入</el-dropdown-item>
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
@@ -455,6 +455,9 @@ export default {
         this.MsgBus.$off('editScene');
     },
   methods: {
+        handleCommand(command){
+            this.$message.warning('功能正在开发中~');
+        },
       changeWhere(item){
         this.msg.ID = item.ID
         this.sceneID = item.ID

src/components/contractManagement/contractManagement.vue

@@ -32,14 +32,14 @@
                         <el-dropdown-item command="3"><i class="iconfont iconweituoweixuanzhong"></i> 单项委托合同</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
-                <el-dropdown>
+                <!-- <el-dropdown>
                     <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><i class="iconfont icondaochu"></i> 导出</el-dropdown-item>
                     </el-dropdown-menu>
-                </el-dropdown>
+                </el-dropdown> -->
             </div>
         </div>
         <div class="query-box">

src/components/customerManage/customerManage.vue

@@ -114,13 +114,13 @@
         <div class="rightmenu">
             <!-- <el-button class="crm-btn query-btn" @click="getList">查询</el-button> -->
             <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="CustomerId = 0, dialogTableVisibleName = '新建客户', dialogTableVisible=true">新建客户</el-button>
-            <el-dropdown>
+            <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><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
-                    <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item>
+                    <el-dropdown-item command="1"><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
+                    <!-- <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> -->
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
@@ -324,14 +324,14 @@
                 show-overflow-tooltip>
             </el-table-column>
             <el-table-column 
-                prop="NowSellName"
+                prop="PersonChargeStr"
                 label="负责人"
                 width="120"
                 v-if="queryType[15].show"
                 show-overflow-tooltip>
             </el-table-column>
             <el-table-column
-                prop="Visit"
+                prop="LastFollowUpTime"
                 label="近期约访"
                 sortable
                 v-if="queryType[16].show"
@@ -631,7 +631,7 @@ export default {
                 pageIndex: 1,
                 pageSize: 30,
                 ContactNumber: '',
-                WhereType: 1,
+                WhereType: -1,
                 OrderBy: '',
                 Data: {},
                 ID: 1,
@@ -731,6 +731,9 @@ export default {
         this.MsgBus.$off('editScene');
     },
   methods: {
+        handleCommand(command){
+            this.$message.warning('功能正在开发中~');
+        },
     changeWhere(item){
         this.msg.ID = item.ID
         this.sceneID = item.ID

src/components/guestManagement/Details.vue

@@ -35,7 +35,7 @@
                 客户名称：
               </el-col>
               <el-col :span="14">
-                {{detailsData.GusetName}}
+                {{detailsData.SurName + detailsData.Name}}
               </el-col>
             </el-row>
           </el-col>
@@ -86,15 +86,113 @@
           <el-col :span="12">
             <el-row>
               <el-col :span="6" class="Details_box_lable">
-                客户来源：
+                身份证号：
               </el-col>
               <el-col :span="14">
-                {{detailsData.CustomerSourceTypeStr}}
+                {{detailsData.IdCard}}
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row :gutter="40" class="Details_box_row">
+          <el-col :span="12">
+            <el-row>
+              <el-col :span="6" class="Details_box_lable">
+                性别：
+              </el-col>
+              <el-col :span="14">
+                {{detailsData.Sex}}
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="12">
+            <el-row>
+              <el-col :span="6" class="Details_box_lable">
+                手机号：
+              </el-col>
+              <el-col :span="14">
+                {{detailsData.MobilePhone}}
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row :gutter="40" class="Details_box_row">
+          <el-col :span="12">
+            <el-row>
+              <el-col :span="6" class="Details_box_lable">
+                护照号：
+              </el-col>
+              <el-col :span="14">
+                {{detailsData.PassportNo}}
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="12">
+            <el-row>
+              <el-col :span="6" class="Details_box_lable">
+                护照签发日期：
+              </el-col>
+              <el-col :span="14">
+                {{detailsData.PassportIssued}}
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row :gutter="40" class="Details_box_row">
+          <el-col :span="12">
+            <el-row>
+              <el-col :span="6" class="Details_box_lable">
+                职务：
+              </el-col>
+              <el-col :span="14">
+                {{detailsData.PassportExpiry}}
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="12">
+            <el-row>
+              <el-col :span="6" class="Details_box_lable">
+                护照过期日期：
+              </el-col>
+              <el-col :span="14">
+                {{detailsData.PassportExpiry}}
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row :gutter="40" class="Details_box_row">
+          <el-col :span="12">
+            <el-row>
+              <el-col :span="6" class="Details_box_lable">
+                单位类型：
+              </el-col>
+              <el-col :span="14">
+                {{detailsData.UnitTypeStr}}
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="12">
+            <el-row>
+              <el-col :span="6" class="Details_box_lable">
+                出游类型：
+              </el-col>
+              <el-col :span="14">
+                {{detailsData.TravelTypeStr}}
               </el-col>
             </el-row>
           </el-col>
         </el-row>
         <el-row  :gutter="40" class="Details_box_row">
+          <el-col :span="12">
+            <el-row>
+              <el-col :span="6" class="Details_box_lable">
+                职位类型：
+              </el-col>
+              <el-col :span="14">
+                {{detailsData. DutyTypeStr}}
+              </el-col>
+            </el-row>
+          </el-col>
           <el-col :span="12">
             <el-row>
               <el-col :span="6" class="Details_box_lable">

src/components/guestManagement/customerInfoBox.vue

@@ -66,7 +66,7 @@
         <div class="drawer-header">
             <div class="left">
                 <img src="../../assets/img/cust/kehu2.png" alt="">
-                <p>{{detailsData.GusetName}}</p>
+                <p>{{detailsData.SurName + detailsData.Name}}</p>
             </div>
             <div class="right">
                 <el-button class="crm-btn query-btn" @click="editCust" >编辑</el-button>

src/components/guestManagement/guestManagement.vue

@@ -17,13 +17,13 @@
         <div class="rightmenu">
             <!-- <el-button class="crm-btn query-btn" @click="getList">查询</el-button> -->
             <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="CustomerId = 0, dialogTableVisibleName = '新建直客', dialogTableVisible=true">新建直客</el-button>
-            <el-dropdown>
+            <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><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
-                    <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item>
+                    <el-dropdown-item command="1"><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
+                    <!-- <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> -->
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
@@ -188,6 +188,9 @@
                 sortable
                 v-if="queryType[29].show"
                 show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <p v-for="(item, index) in scope.row.EconomicCapability" :key="index">{{item.Value}}</p>
+                </template>
             </el-table-column>
             <el-table-column
                 prop="IsRecommendStr"
@@ -295,25 +298,11 @@
                 v-if="queryType[22].show"
                 show-overflow-tooltip>
             </el-table-column>
-            <el-table-column
-                prop="Birthday"
-                label="余额"
-                sortable
-                v-if="queryType[13].show"
-                show-overflow-tooltip>
-            </el-table-column>
-            <el-table-column
-                prop="Birthday"
-                label="余额"
-                sortable
-                v-if="queryType[13].show"
-                show-overflow-tooltip>
-            </el-table-column>
             <el-table-column
                 prop="CustomerLevelStr"
                 label="客户等级"
                 sortable
-                v-if="queryType[7].show"
+                v-if="false"
                 show-overflow-tooltip>
             </el-table-column>
             <el-table-column
@@ -635,7 +624,7 @@ export default {
                 label: '订单交易数',
                 show: true,
             },{
-                label: '交易金额',
+                label: '订单金额',
                 show: true,
             },{
                 label: '出境记录',
@@ -742,6 +731,9 @@ export default {
         this.MsgBus.$off('editScene');
     },
   methods: {
+      handleCommand(command){
+            this.$message.warning('功能正在开发中~');
+        },
     changeWhere(item){
         this.msg.ID = item.ID
         this.sceneID = item.ID
@@ -895,6 +887,9 @@ export default {
         this.apipost('/api/Customer/GetGuesstCustomerPageList', this.msg, res=>{
             if (res.data.resultCode == 1) {
                 this.tableData = res.data.data.pageData;
+                this.tableData.map(x=>{
+                    x.EconomicCapability = JSON.parse(x.EconomicCapability)
+                })
                 this.total = res.data.data.count;
                 this.loading = false;
             }

src/components/watersManagement/Activity.vue

@@ -365,10 +365,10 @@
                   <span>附件</span>
                 </div>
               </el-upload>
-              <div class="ctrl-btn">
+              <!-- <div class="ctrl-btn">
                 <i class="iconfont iconguanlianbg"></i>
                 <span>关联商机</span>
-              </div>
+              </div> -->
               <!-- <div>
                 <i class="iconfont iconkehu"></i>
                 <span>关联联系人</span>

src/components/watersManagement/watersManagement.vue

@@ -13,13 +13,13 @@
         <div class="rightmenu">
             <!-- <el-button class="crm-btn query-btn" @click="getList">查询</el-button> -->
             <!-- <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="CustomerId = 0, dialogTableVisibleName = '新建客户', dialogTableVisible=true">新建</el-button> -->
-            <el-dropdown>
+            <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><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
-                    <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item>
+                    <el-dropdown-item command="1"><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
+                    <!-- <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> -->
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
@@ -526,6 +526,9 @@ export default {
         this.MsgBus.$off('sceneSave');
     },
   methods: {
+      handleCommand(command){
+            this.$message.warning('功能正在开发中~');
+        },  
     changeWhere(item){
         this.msg.ID = item.ID
         this.sceneID = item.ID

src/main.js

@@ -21,6 +21,8 @@ import 'xe-utils'
 import vueQuillEditor from 'vue-quill-editor'
 import 'quill/dist/quill.core.css'
 import 'quill/dist/quill.snow.css'
+import pinyin from 'pinyin'
+Vue.prototype.pinyin = pinyin
 // import VXETable from 'vxe-table'
 // import 'vxe-table/lib/index.css'
 // import tinymce from 'tinymce/tinymce'