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

src/components/clueManagement/clueManagement.vue

@@ -146,18 +146,21 @@
                 v-if="queryType[0].show"
                 show-overflow-tooltip>
                 <template slot-scope="scope">
-                    <p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.ClueName}}</p>
+                    <p @click="openDetails(scope)" class="font-color-link cp">{{msg.CustomerType===1?scope.row.ClueName:scope.row.CustomerName}}</p>
                 </template>
 </el-table-column>
 <el-table-column prop="CustomerSourceTypeStr" label="线索来源" v-if="queryType[1].show" show-overflow-tooltip>
 </el-table-column>
-<el-table-column prop="CustomerSource" label="来源细分" v-if="queryType[2].show && msg.CustomerType === 1" show-overflow-tooltip>
+<!-- CustomerSource 其他的来源 -->
+<el-table-column prop="SourceAccountName" label="来源细分" v-if="queryType[2].show && msg.CustomerType === 1" show-overflow-tooltip>
 </el-table-column>
 <el-table-column prop="ClueDemand" label="需求" v-if="queryType[3].show && msg.CustomerType === 1" show-overflow-tooltip>
 </el-table-column>
 <el-table-column prop="CustomerLevelStr" label="客户级别" sortable width="100" v-if="queryType[4].show && msg.CustomerType === 0" show-overflow-tooltip>
 </el-table-column>
-<el-table-column prop="CustomerName" label="联系人" v-if="queryType[5].show" show-overflow-tooltip>
+<el-table-column prop="Contact" label="联系人" v-if="queryType[5].show&&msg.CustomerType!=1" show-overflow-tooltip>
+</el-table-column>
+<el-table-column prop="CustomerName" label="联系人" v-if="queryType[5].show&&msg.CustomerType===1" show-overflow-tooltip>
 </el-table-column>
 <el-table-column prop="MobilePhone" label="联系电话" sortable v-if="queryType[6].show" show-overflow-tooltip>
 </el-table-column>

src/components/guestManagement/guestManagement.vue

@@ -104,11 +104,19 @@
                 <el-table-column prop="MobilePhone" label="手机号码" width="120" v-if="queryType[1].show"
                     show-overflow-tooltip>
                 </el-table-column>
-                <el-table-column prop="Address" label="地址" v-if="queryType[2].show" show-overflow-tooltip>
-                </el-table-column>
+                
                 <el-table-column prop="CustomerSourceTypeStr" label="客户来源" v-if="queryType[3].show"
                     show-overflow-tooltip>
                 </el-table-column>
+                <el-table-column prop="SourceAccountName" label="来源细分" v-if="queryType[31].show"
+                    show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="ClueDemand" label="需求" v-if="queryType[32].show"
+                    show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="WeChatNo" label="微信号" v-if="queryType[33].show"
+                    show-overflow-tooltip>
+                </el-table-column>
                 <el-table-column prop="TraveNum" label="参团数" sortable v-if="queryType[4].show" show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column prop="OrderCount" label="订单交易数" sortable v-if="queryType[24].show"
@@ -122,6 +130,8 @@
                 </el-table-column>
                 <el-table-column prop="AddressDetail" label="家庭详细地址" sortable v-if="queryType[27].show"
                     show-overflow-tooltip>
+                <el-table-column prop="Address" label="地址" v-if="queryType[2].show" show-overflow-tooltip>
+                </el-table-column>
                 </el-table-column>
                 <el-table-column prop="HistoryRecord" label="出境记录" sortable v-if="queryType[26].show"
                     show-overflow-tooltip>
@@ -448,7 +458,16 @@
                 }, {
                     label: "是否推存",
                     show: true,
-                }, ],
+                }, {
+                    label: "来源细分",
+                    show: true,
+                }, {
+                    label: "需求",
+                    show: true,
+                }, {
+                    label: "微信号",
+                    show: true,
+                },],
                 CustomerId: 0,
                 CustomerIdStr: "",
                 transferVisible: false,