中文客户添加/编辑/详情,所属区域为海外时增加所属国家

src/views/custom_manage/customList/addCustom.vue

@@ -61,20 +61,22 @@
 				disabled
 				clearable></el-input>
 			</el-form-item>
-			<el-form-item label="客户地址" prop="city"  :rules="[{
+			<el-form-item v-if="dataForm.area==='海外'" label="所属国家" prop="Nation"
+				:rules="[{required:true,message: '所属国家不能为空', trigger: 'change' }]">
+				<el-select v-model="dataForm.Nation" placeholder="请选择" filterable style="width: 400x;">
+					<el-option :label="item.cnName" :value="item.cnName" v-for="item in countryData" :key="item.code" >
+					<div style="display: flex;justify-content: space-between;">
+						<span>{{ item.cnName }}</span>
+						<span style="color: #8492a6; font-size: 13px">{{ item.code }}</span>
+					</div>
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item v-else label="客户地址" prop="city"  :rules="[{
 					required:true,
 					message: '客户地址不能为空', 
-					trigger: 'change' 
-        }]">
+					trigger: 'change' }]">
 				<i style="color:#f00;fontSize:20px;position:absolute;left:-90px;top:10%;">*</i>
-				<!-- <v-distpicker :province-source="province_sorce"
-                :city-source="city_sorce"  
-				:province="dataForm.province"
-				:city="dataForm.city"
-				hide-area 
-				@selected="selectRegion"
-				@province="provinceChange"
-				></v-distpicker> -->
 				<search-dist-picker @selected="selectRegion"/>
 			</el-form-item>
 			<el-form-item label="客户状态" prop="cuStatus" style="marginRight:120px;">
@@ -222,6 +224,7 @@
 
 <script>
 import { customInterence } from '@/api/api.js'
+import country from "@/utils/countryData"
 //import{province_sorce,city_sorce} from '@/utils/distpicker';
 import Contactdia from '../compontents/Contactdialog'
 // import JurisdictionCheck from '../compontents/jurisdictionCheck.vue';
@@ -251,6 +254,7 @@ export default {
 	data () {
 /*     this.province_sorce=province_sorce
     this.city_sorce=city_sorce */
+		this.countryData = country
 		return {
 			codeDisable:false,//是否可编辑社会信用码国内可
 			companyList:[],
@@ -589,7 +593,8 @@ export default {
 					Reasons:this.dataForm.addreason,
 					PermissionIds,
 					Scale:this.dataForm.money,
-					UserId:Number(id)
+					UserId:Number(id),
+					Nation:this.dataForm.area==='海外'?this.dataForm.Nation:''
 				}
 				customInterence.customAdd(params).then(res => {
 					if(res.Ret === 200) {

src/views/custom_manage/customList/customDetail.vue

@@ -20,7 +20,11 @@
 							<label class="label">所属区域</label>
 							<span class="con">{{basicform.RegionType}}</span>
 						</li>
-						<li >
+						<li v-if="basicform.RegionType==='海外'">
+							<label for="label">所属国家</label>
+							<span class="con">{{basicform.Notion}}</span>
+						</li>
+						<li v-else>
 							<label class="label">客户地址</label>
 							<span class="con">{{basicform.Province}}<span v-if="basicform.Province">/</span>{{basicform.City}}</span>
 						</li>

src/views/custom_manage/customList/editCustom.vue

@@ -45,16 +45,18 @@
 						<el-form-item label="所属区域" prop="RegionType" style="width:26%">
 							<span style="color:#333;font-size: 15px;">{{basicform.RegionType}}</span>
 						</el-form-item>
-						<el-form-item label="客户地址" prop="City" style="width:33%">
-							<!-- <v-distpicker :province-source="province_sorce"
-                :city-source="city_sorce" 
-								:province="basicform.Province"
-								:city="basicform.City"
-								hide-area
-								@selected="selectRegion"
-								@province="provinceChange"
-								:disabled="!canEidtBtns.BaseInfoEdit">
-							</v-distpicker> -->
+						<el-form-item v-if="basicform.RegionType==='海外'" label="所属国家" prop="Nation" style="width:26%"
+							:rules="[{required:true,message: '所属国家不能为空', trigger: 'change' }]">
+							<el-select v-model="basicform.Nation" placeholder="请选择" filterable>
+								<el-option :label="item.cnName" :value="item.code" v-for="item in countryData" :key="item.code" >
+									<div style="display: flex;justify-content: space-between;">
+										<span>{{ item.cnName }}</span>
+										<span style="color: #8492a6; font-size: 13px">{{ item.code }}</span>
+									</div>
+								</el-option>
+							</el-select>
+						</el-form-item>
+						<el-form-item v-else label="客户地址" prop="City" style="width:33%">
 							<search-dist-picker 
 								:provinceInfo="basicform.Province"
 								:cityInfo="basicform.City"
@@ -467,6 +469,7 @@ import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 // import CpessionTableEquity from '../compontents/CpessionTableEquity.vue'
 import autocomplete from "@/components/autocomplete.vue";
 import searchDistPicker from '@/components/searchDistPicker.vue';
+import country from "@/utils/countryData"
 
 export default {
 	name:'',
@@ -503,6 +506,7 @@ export default {
 	data () {
 /*     this.province_sorce=province_sorce
     this.city_sorce=city_sorce */
+		this.countryData = country
 		return {
 			isCheck: false,
 			canEidtBtns:{},
@@ -1076,7 +1080,8 @@ export default {
 				Province:this.basicform.Province,
 				CompanyName:this.basicform.CompanyName,
 				CreditCode:this.basicform.CreditCode,
-				Products:params_arr
+				Products:params_arr,
+				Nation:this.basicform.RegionType==='海外'?this.basicform.Nation:''
 			}
 			
 			customInterence.customEdit(params).then(res => {

src/views/custom_manage/customList/editCustomEn.vue

@@ -280,7 +280,11 @@ import reportVarietyEnSet from '@/components/reportVarietyEnSet.vue'
       editSubmit(){
         this.$refs.editForm.validate(valid=>{
           if(valid){
-            customInterence.addCustomEn({...this.editForm,EnPermissions:this.$refs.varietyIns.checkedItems||[]}).then(res=>{
+            customInterence.addCustomEn({
+                ...this.editForm,
+                EnPermissions:this.$refs.varietyIns.checkedItems||[],
+                Nation:this.editForm.Country
+            }).then(res=>{
               if(res.Ret == 200){
                 let messageEle=this.$message.success(this.$route.path == '/addCustomEn'?'添加客户成功':'编辑客户成功')
                 setTimeout(()=>{

src/views/custom_manage/overseasList/overseasCustomList.vue

@@ -91,10 +91,12 @@ export default {
     data() {
         return {
             pageSelect:'海外客户',
+            salesArr:[],//管理员-选择销售后的销售列表
             tableTabs:[],
             tryTabs:[],
             statusSelect:'全部',//客户状态
             tagStatusSelect:'全部',//客户试用状态
+            AllSalesArr:[],//所有销售列表
             columns:[{
                 label:"客户名称",
                 key:'name'
@@ -149,7 +151,12 @@ export default {
             }).then(res=>{
                 if(res.Ret!==200) return 
                 this.tableTabs = res.Data.StatusCount
-                this.tryTabs = res.Data.TryStageCount?res.Data.TryStageCount:[]
+                //重新排序:全部 ... 未分类
+                this.tryTabs = res.Data.TryStageCount ? res.Data.TryStageCount.sort((x,y) => x.TryStage-y.TryStage ) : []
+                if(this.tryTabs.length) {
+                    const [ x, y, ...res] = this.tryTabs;
+                    this.tryTabs = [ x,...res,y ];
+                }
             })
         },
         //切换客户状态