需求池277 线上、线下路演客户名称允许选择海外客户

pages-approve/activity/detail.vue

@@ -41,31 +41,44 @@
 				</view>
 			</view>
 			<view class="section white-wrap">
-				<view class="info-item flex">
-					<view class="label">客户状态:</view>
-					<view>{{info.CompanyDetail.Status}}</view>
-				</view>
-				<view class="info-item flex">
-					<view class="label">所属行业:</view>
-					<view>{{info.CompanyDetail.IndustryName}}</view>
-				</view>
-				<view class="info-item flex">
-					<view class="label">开通品种:</view>
-					<view>{{info.CompanyDetail.PermissionName}}</view>
-				</view>
-				<view class="info-item flex">
-					<view class="label">累计阅读报告次数:</view>
-					<view>{{info.CompanyDetail.ReportReadTotal}}</view>
-				</view>
-				<view class="line"></view>
-				<view class="info-item flex" v-if="Role === 'researcher'">
-					<view class="label">提交销售:</view>
-					<view>{{info.RsCalendarItem.SysUserRealName}}</view>
-				</view>
-				<view class="info-item flex">
-					<view class="label">提交时间:</view>
-					<view>{{info.RsCalendarItem.CreateTime|formatTime}}</view>
-				</view>
+        <template v-if="info.CompanyDetail.EnglishCompany===1">
+          <view class="info-item flex">
+            <view class="label">所属国家:</view>
+            <view>{{info.CompanyDetail.EnglishCountry}}</view>
+				  </view>
+          <view class="info-item flex">
+            <view class="label">累计点击量:</view>
+            <view>{{info.CompanyDetail.EnglishViewTotal}}</view>
+				  </view>
+        </template>
+        <template v-else>
+          <view class="info-item flex">
+            <view class="label">客户状态:</view>
+            <view>{{info.CompanyDetail.Status}}</view>
+          </view>
+          <view class="info-item flex">
+            <view class="label">所属行业:</view>
+            <view>{{info.CompanyDetail.IndustryName}}</view>
+          </view>
+          <view class="info-item flex">
+            <view class="label">开通品种:</view>
+            <view>{{info.CompanyDetail.PermissionName}}</view>
+          </view>
+          <view class="info-item flex">
+            <view class="label">累计阅读报告次数:</view>
+            <view>{{info.CompanyDetail.ReportReadTotal}}</view>
+          </view>
+          <view class="line"></view>
+          <view class="info-item flex" v-if="Role === 'researcher'">
+            <view class="label">提交销售:</view>
+            <view>{{info.RsCalendarItem.SysUserRealName}}</view>
+          </view>
+          <view class="info-item flex">
+            <view class="label">提交时间:</view>
+            <view>{{info.RsCalendarItem.CreateTime|formatTime}}</view>
+          </view>
+        </template>
+				
 			</view>
 			<view class="section white-wrap"
 				v-if="info.RsCalendarResearcherItem.Status==2||info.RsCalendarResearcherItem.Status==3">

pages-approve/search/index.vue

@@ -90,6 +90,7 @@
 					})
 				}else if(this.type==='roadshow'){
 					let id = uni.setStorageSync('roadshow_compantyId',e.CompanyId)
+          let englishCompany = uni.setStorageSync('roadshow_isEnglishCompany',e.EnglishCompany)
 					uni.navigateBack({
 						delta: 1
 					});

pages-roadshow/addActivity/index.vue

@@ -57,10 +57,17 @@
 			/>
 			
 			<view class="company-info" v-if="formData.activityType === '路演' && formData.companyId && companyInfo">
-				<view>客户状态：{{companyInfo.Status}}</view>
-				<view>所属行业：{{companyInfo.IndustryName}}</view>
-				<view>开通品种：{{companyInfo.PermissionName}}</view>
-				<view>累计报告阅读次数：{{companyInfo.ReportReadTotal}}</view>
+        <template v-if="companyInfo.EnglishCompany">
+          <view>所属国家：{{companyInfo.EnglishCountry}}</view>
+          <view>累计点击量：{{companyInfo.EnglishViewTotal}}</view>
+        </template>
+        <template v-else>
+          <view>客户状态：{{companyInfo.Status}}</view>
+          <view>所属行业：{{companyInfo.IndustryName}}</view>
+          <view>开通品种：{{companyInfo.PermissionName}}</view>
+          <view>累计报告阅读次数：{{companyInfo.ReportReadTotal}}</view>
+        </template>
+				
 			</view>
 
 			<van-field 
@@ -328,8 +335,10 @@
 			
 			if(uni.getStorageSync('roadshow_compantyId')) {
 				this.formData.companyId = Number(uni.getStorageSync('roadshow_compantyId'));
+        this.formData.englishCompany = Number(uni.getStorageSync('roadshow_isEnglishCompany'))
 				this.getCompanyInfo();
 				uni.removeStorageSync('roadshow_compantyId');
+        uni.removeStorageSync('roadshow_isEnglishCompany');
 			}
 		}
 	}

pages-roadshow/addActivity/mixin.js

@@ -104,7 +104,8 @@ export default {
 		/* 获取客户信息 */
 		async getCompanyInfo() {
 			const res = await companyInfo({ 
-				CompanyId: this.formData.companyId
+				CompanyId: this.formData.companyId,
+        EnglishCompany:this.formData.englishCompany
 			})
 			if(res.code !== 200) return
 			this.companyInfo = res.data;
@@ -195,6 +196,7 @@ export default {
 				CompanyId: this.formData.companyId || 0,
 				CompanyName: this.formData.companyName || '',
 				ResearcherList: param_research,
+        EnglishCompany:this.formData.englishCompany
 			};
 		
 			// console.log(parmas);

pages-roadshow/utils/area.js

@@ -34,6 +34,7 @@ export const areaList = {
     710000: '台湾省',
     810000: '香港特别行政区',
     820000: '澳门特别行政区',
+    900000: '海外'
   },
   city_list: {
     110100: '北京市',
@@ -405,5 +406,7 @@ export const areaList = {
     810300: '新界',
     820100: '澳门半岛',
     820200: '离岛',
+    900100: '其他市',
+    900200: '新加坡'
   }
 };