改国际化

src/assets/common/lang/zh-tw.js

@@ -1536,6 +1536,31 @@ export const rule = {
   qsrzjine: '請輸入總金額',
   qxzrzshijian: '請選擇入職時間！',
   qsrzqdqq: '請輸入正確的qq！',
+  EnterContratPerson:'請輸入連絡人',
+  EnterCustomer:'請輸入客戶名',
+  EnterPNum:'請輸入聯繫電話',
+  EnterRightNum:'請輸入正確的電話',
+  ChoiceBrand:'請選擇所屬品牌',
+  ChoiceJob:'請選擇職務',
+  ChoiceJYCS:'請選擇經營場所',
+  ChoiceCusFrom:'請選擇經客戶來源',
+  EnterCusName:'請輸入客戶名',
+  EnterBrandName:'請輸入品牌名稱',
+  ChoiceVDate:'請選擇拜訪日期',
+  ChoiceVTime:'請選擇拜訪時間',
+  ChoiceLC:'請選擇所屬流程',
+  EnterCusName:'請輸入客戶名稱',
+  EnterCusAds:'請輸入客戶地址',
+  EnterTaskName:'請輸入任務名稱',
+  ChoiceTaskType:'請選擇任務類型',
+  EnterNum:'請輸入數量',
+  OnlyInter:'只能輸入正整數',
+  ChoiceRQFW:'請選擇時間範圍',
+  EnterMark:'請輸入備註',
+  OnlyNumber:'只能輸入數位',
+  EnterPnum:'請輸入人數',
+  EnterRJRQ:'請輸入入境日期',
+  EnterCJRQ:'請輸入出境日期',
 }
 
 export const adm={

src/assets/common/lang/zh.js

@@ -820,7 +820,7 @@ export const fnc = {
   khuren: '开户人：',
   ptAcc: '平台账户：',
   suoshugs: '所属公司：',
-  ptsyongfei: '平台使用费：',
+  ptsffangshi: '平台使用费：',
   ptsffangshi: '平台收费方式：',
   abfenbi: '按百分比',
   anrentou: '按人头',
@@ -1258,7 +1258,7 @@ export const tips = {
   tips: '提示',
   shifoudui: '是否对',
   zhshanchu: '账户进行销户操作？销户后不可恢复！',
-  cancleDelete: '已取消删除',
+  cancleDelete: '已取消删除！',
   saveYes: '保存成功！',
   sxhuilv: '以下汇率系统将每隔30分钟实时更新一次',
   yssdliucheng: '注：以上费用类型将会被执行你设定的流程',
@@ -1546,7 +1546,31 @@ export const rule = {
   qxzrzshijian: '请选择入职时间!',
   qsrzqdqq: '请输入正确的qq!',
   
-  
+  EnterContratPerson:'请输入联系人',
+  EnterCustomer:'请输入客户名',
+  EnterPNum:'请输入联系电话',
+  EnterRightNum:'请输入正确的电话',
+  ChoiceBrand:'请选择所属品牌',
+  ChoiceJob:'请选择职务',
+  ChoiceJYCS:'请选择经营场所',
+  ChoiceCusFrom:'请选择经客户来源',
+  EnterCusName:'请输入客户名',
+  EnterBrandName:'请输入品牌名称',
+  ChoiceVDate:'请选择拜访日期',
+  ChoiceVTime:'请选择拜访时间',
+  ChoiceLC:'请选择所属流程',
+  EnterCusName:'请输入客户名称',
+  EnterCusAds:'请输入客户地址',
+  EnterTaskName:'请输入任务名称',
+  ChoiceTaskType:'请选择任务类型',
+  EnterNum:'请输入数量',
+  OnlyInter:'只能输入正整数',
+  ChoiceRQFW:'请选择时间范围',
+  EnterMark:'请输入备注',
+  OnlyNumber:'只能输入数字',
+  EnterPnum:'请输入人数',
+  EnterRJRQ:'请输入入境日期',
+  EnterCJRQ:'请输入出境日期',
 }
 
 export const adm={
@@ -1779,6 +1803,7 @@ export const MarketingActi={
   commTypename:'商品类型名称',
   typeNum:'类型编号',
   notShow:'不显示',
+  
   commName:'商品名称',
   commType:'商品类型',
   commActivity:'商品活动',
@@ -2262,11 +2287,8 @@ export const sm={
   songji:"送机",
   bantian:"半天",
   buyongche:"不用车",
-  qingxuanzchufacity:"请选择出发城市",
   qingxuanzjiaotongType:"请选择交通类型",
   qingxuanzchufacity:"请选择出发城市",
-  qingxuanzchufacity:"请选择出发城市",
-  qingxuanzchufacity:"请选择出发城市",
   qsrjiaotonginfo:"请输入交通信息",
   qxztime:"请选择时间",
   scenChoosse:"景点选择",

src/components/SalesModule/CustomerCertification.vue

@@ -146,7 +146,7 @@
         <th width="10%">{{$t('salesModule.storeName')}}</th>
         <th width="10%">{{$t('hotel.suplier_contact')}}</th>
         <th width="10%">{{$t('hotel.table_tel')}}</th>
-        <th width="10%">{{$t('MarketingActi.TransactionMon')}}</th>
+        <th width="10%">{{$t('salesModule.TransactionMon')}}</th>
         <th width="10%">{{$t('admin.admin_address')}}</th>
         <th width="10%">{{$t('salesModule.belongUnion')}}</th>
         <th width="10%">{{$t('salesModule.ApplyTime')}}</th>

src/components/SalesModule/MyCustomer.vue

@@ -388,19 +388,19 @@ export default {
                 }
             },
             rules:{
-                contact:[{required: true, message: "请输入联系人", trigger: "blur"}],
-                customerName:[{required: true, message: "请输入客户名", trigger: "blur"}],
+                contact:[{required: true, message:this.$t('rule.EnterContratPerson'), trigger: "blur"}],
+                customerName:[{required: true, message:this.$t('rule.EnterCustomer'), trigger: "blur"}],
                 contactNumber:[
-                    {required: true, message: "请输入联系电话", trigger: "blur"},
-                    { pattern: /^1[123457890]\d{9}$/, message: "请输入正确的电话" }
+                    {required: true, message:this.$t('rule.EnterPNum'), trigger: "blur"},
+                    { pattern: /^1[123457890]\d{9}$/, message:this.$t('rule.EnterRightNum') }
                 ],
-                brandIds:[{required: true, message: "请选择所属品牌", trigger: "change"}],
-                Duty:[{required: true, message: "请选择职务", trigger: "change"}],
-                remark:[{required: false, message: "请选择职务", trigger: "change"}],
-                Premises:[{required: true, message: "请选择经营场所", trigger: "change"}],
-                CustomerSourceType:[{required: true, message: "请选择经客户来源", trigger: "change"}],
-                customerName:[{required: true, message: "请输入客户名", trigger: "blur"}],
-                address:[{required: true, message: "请输入地址", trigger: "blur"}],
+                brandIds:[{required: true, message:this.$t('rule.ChoiceBrand'), trigger: "change"}],
+                Duty:[{required: true, message:this.$t('rule.ChoiceJob'), trigger: "change"}],
+                remark:[{required: false, message: this.$t('rule.ChoiceJob'), trigger: "change"}],
+                Premises:[{required: true, message:this.$t('rule.ChoiceJYCS'), trigger: "change"}],
+                CustomerSourceType:[{required: true, message:this.$t('rule.ChoiceCusFrom'), trigger: "change"}],
+                customerName:[{required: true, message:this.$t('rule.EnterCusName'), trigger: "blur"}],
+                address:[{required: true, message:this.$t('visaT.qsradder'), trigger: "blur"}],
             },
             dataList:[],
             CustomerBrandList:[],
@@ -421,19 +421,19 @@ export default {
         }
     },methods:{
     	deleteCustomer(obj){
-			this.$confirm('是否删除?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
+			this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
+				confirmButtonText: this.$t('pub.sureBtn'),
+				cancelButtonText: this.$t('pub.cancelBtn'),
 				type: 'warning'
 			}).then(() => {
 				this.apipost('app_customer_Remove',{ID:obj.customerId},res=>{
 					if(res.data.resultCode==1){
-						this.$message.success('删除成功！');
+						this.Success(res.data.message);
 						this.getList()
 					}
 				},err=>{})
 			}).catch(() => {
-				this.$message.info('已取消删除！');
+				this.Error('已取消删除！');
 			});
     	},
 	    uploadImg(file) {

src/components/SalesModule/SalesAssessment.vue

@@ -67,12 +67,12 @@
     		},
     		rules:{
 				RequireScore:[
-				  { required: true, message: '请输入', trigger: 'blur' },
-				  {pattern: /^\d*$/, message: '只能输入数字' }
+				  { required: true, message:this.$t('pub.pleaseImport'), trigger: 'blur' },
+				  {pattern: /^\d*$/, message:this.$t('rule.OnlyNumber')}
 				],  
 				Ratio:[
-				  { required: true, message: '请输入', trigger: 'blur' },
-				  {pattern: /^\d*$/, message: '只能输入数字' }
+				  { required: true, message:this.$t('pub.pleaseImport'), trigger: 'blur' },
+				  {pattern: /^\d*$/, message:this.$t('rule.OnlyNumber')}
 				]
     		},
     		dataList:[]

src/components/SalesModule/VisitPlan.vue

@@ -675,19 +675,19 @@ export default {
                 }
             },
             rules:{
-                customerInfoId:[{required: true, message: "请选择客户", trigger: "change"}],
-                newVisitDay:[{required: true, message: "请选择拜访日期", trigger: "change"}],
-                newVisitTime:[{required: true, message: "请选择拜访时间", trigger: "change"}],
-                SalesProcess:[{required: true, message: "请选择所属流程", trigger: "change"}],
-                customerName:[{required: true, message: "请输入客户名称", trigger: "blur"}],
-                contact:[{required: true, message: "请输入联系人", trigger: "blur"}],
-                contactNumber:[{required: true, message: "请输入联系电话", trigger: "blur"}],
-                address:[{required: true, message: "请输入客户地址", trigger: "blur"}],
-                brandIds:[{required: true, message: "请选择所属品牌", trigger: "change"}],
-                Duty:[{required: true, message: "请选择职务", trigger: "change"}],
-                remark:[{required: false, message: "请选择职务", trigger: "change"}],
-                Premises:[{required: true, message: "请选择经营场所", trigger: "change"}],
-                CustomerSourceType:[{required: true, message: "请选择经客户来源", trigger: "change"}],                  
+                customerInfoId:[{required: true, message:this.$t('rule.qxzkhmingcheng'), trigger: "change"}],
+                newVisitDay:[{required: true, message:this.$t('rule.ChoiceVDate'), trigger: "change"}],
+                newVisitTime:[{required: true, message:this.$t('rule.ChoiceVTime'), trigger: "change"}],
+                SalesProcess:[{required: true, message:this.$t('rule.ChoiceLC'), trigger: "change"}],
+                customerName:[{required: true, message:this.$t('rule.EnterCusName'), trigger: "blur"}],
+                contact:[{required: true, message:this.$t('rule.EnterContratPerson'), trigger: "blur"}],
+                contactNumber:[{required: true, message:this.$t('rule.EnterPNum'), trigger: "blur"}],
+                address:[{required: true, message:this.$t('rule.EnterCusAds'), trigger: "blur"}],
+                brandIds:[{required: true, message:this.$t('rule.ChoiceBrand'), trigger: "change"}],
+                Duty:[{required: true, message:this.$t('rule.ChoiceJob'), trigger: "change"}],
+                remark:[{required: false, message:this.$t('rule.ChoiceJob'), trigger: "change"}],
+                Premises:[{required: true, message:this.$t('rule.ChoiceJYCS'), trigger: "change"}],
+                CustomerSourceType:[{required: true, message:this.$t('rule.ChoiceCusFrom'), trigger: "change"}],                  
             },
             pickerOptions0: {
                 disabledDate(time) {
@@ -949,9 +949,9 @@ export default {
     		},err=>{})
     	},
     	deleteItem(obj,date){
-    		this.$confirm('是否删除', '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
+    		this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
+					confirmButtonText: this.$t('pub.sureBtn'),
+					cancelButtonText: this.$t('pub.cancelBtn'),
 					type: 'warning'
 				}).then(() => {
 					this.apipost('app_today_visit_RemoveCustomerVisit', {
@@ -966,7 +966,7 @@ export default {
 						}
 					}, err => {})
 				}).catch(() => {
-					this.$message.info('取消删除');
+                        this.$message.info(this.$t('tips.cancleDelete'));
 				});
     	},
         goUrl(path,time) {

src/components/SalesModule/branding.vue

@@ -90,7 +90,7 @@ export default {
     },
     editOk: function() {
       if (this.editData.Name === "") {
-        this.$message.error("请输入品牌名称");
+        this.$message.error(this.$t('rule.EnterBrandName'));
       } else {
         this.apipost(
           "customer_post_Set",
@@ -109,9 +109,9 @@ export default {
       }
     },
     delBtn: function(key) {
-      this.$confirm("是否改品牌删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
+      this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
+        confirmButtonText: this.$t('pub.sureBtn'),
+        cancelButtonText: this.$t('pub.cancelBtn'),
         type: "warning"
       }).then(() => {
           this.apipost(
@@ -129,7 +129,7 @@ export default {
           );
         })
         .catch(() => {
-          this.$message.info("已取消删除！");
+          this.$message.info(this.$t('tips.cancleDelete'));
         });
     },
     getList: function() {

src/components/SalesModule/publicCustomer.vue

@@ -58,8 +58,8 @@
 					<th width="20%">{{$t('admin.admin_address')}}</th>
 					<th width="10%">{{$t('salesModule.belongUnion')}}</th>
 					<th width="10%">{{$t('salesModule.Laiyuan')}}</th>
-					<th width="8%">{{$t('MarketingActi.VisitCount')}}</th>
-					<th width="10%">{{$t('MarketingActi.TransactionMon')}}</th>
+					<th width="8%">{{$t('salesModule.VisitCount')}}</th>
+					<th width="10%">{{$t('salesModule.TransactionMon')}}</th>
 					<th width="10%">{{$t('active.cl_addPp')}}</th>
 					<th width="5%">{{$t('hotel.table_operat')}}</th>
 				</tr>

src/components/SalesModule/saleTaskManagement.vue

@@ -12,7 +12,7 @@
 							<el-input type="text" :disabled='isAllocatingTask' v-model='addTaskMsg.TaskName' :placeholder="$t('visaT.Pleasefillin')"></el-input>
 						</el-form-item>
 						<el-form-item class='w300' :label="$t('salesModule.TaskType')" prop="TaskType">
-							<el-select  placeholder="请选项"  :disabled='isDisabled||isAllocatingTask'  v-model='addTaskMsg.TaskType'>
+							<el-select  :placeholder="$t('pub.pleaseSel')"  :disabled='isDisabled||isAllocatingTask'  v-model='addTaskMsg.TaskType'>
 								<el-option v-for='item in taskTypeList'
 									 :label='item.Name'
 									 :value='item.Id'
@@ -128,7 +128,7 @@
 					</div>
 				</div>
 				<p style="text-align: right; width: 100%;  clear: both;">
-						<input type="button" class="hollowFixedBtn" value="取消" @click="clearMsg"/>
+						<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="clearMsg"/>
 						<input v-if='!isAllocatingTask' type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm('addTaskMsg')"/>
 						<input v-if='isAllocatingTask' type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="saveAllocatingTask"/>
 				</p>
@@ -355,20 +355,20 @@
 	    		},
 	    		rules:{
 	                TaskName:[
-					  { required: true, message: '请输入任务名称', trigger: 'blur' }
+					  { required: true, message:this.$t('rule.EnterTaskName'), trigger: 'blur' }
 					],
 					 TaskType:[
-					  { required: true, message: '请选择任务类型', trigger: 'change' }
+					  { required: true, message:this.$t('rule.ChoiceTaskType'), trigger: 'change' }
 					],
 					TaskNum:[
-                    { required: true, message: '请输入数量', trigger: 'blur' },
-                    { pattern: /^[1-9]\d*$/, message: "只能输入正整数" }
+                    { required: true, message:this.$t('rule.EnterNum'), trigger: 'blur' },
+                    { pattern: /^[1-9]\d*$/, message:this.$t('rule.OnlyInter') }
                 	],
 					taskTime:[
-					  { required: true, message: '请选择时间范围', trigger: 'change' }
+					  { required: true, message:this.$t('rule.ChoiceRQFW'), trigger: 'change' }
 					],
 					Remarks:[
-					  { required: false, message: '请输入备注', trigger: 'blur' }
+					  { required: false, message:this.$t('rule.EnterMark'), trigger: 'blur' }
 					],
 					 
 	    		},

src/components/SalesModule/workTotal.vue

@@ -40,7 +40,7 @@
 				<th width="15%">{{$t('salesModule.Personnel')}}</th>
 				<th width="15%">{{$t('salesModule.Visital')}}</th>
 				<th width="15%">{{$t('salesModule.laxin')}}</th>
-				<th width="15%">{{$t('MarketingActi.ShouKe')}}</th>
+				<th width="15%">{{$t('salesModule.ShouKe')}}</th>
 				<th width="10%">{{$t('fnc.shoukuan')}}</th>
 				<th width="10%">{{$t('salesModule.MakeInquiry')}}</th>
 				<th width="10%">{{$t('salesModule.Complaints')}}</th>

src/components/SalesVisa/VisaProductAddOrder.vue

@@ -299,10 +299,10 @@ export default {
 				ClientType: '1'
             },
             rules:{
-				PeopleNum:[{required: true, message: "请输入人数", trigger: "blur"}],
+				PeopleNum:[{required: true, message:this.$t('rule.EnterPnum'), trigger: "blur"}],
 				// DepartDate:[{required: true, message: "请输入出发日期", trigger: "blur"}],
-				EnterCountryTime:[{required: true, message: "请输入入境日期", trigger: "blur"}],
-				LeaveCountryTime:[{required: true, message: "请输入出境日期", trigger: "blur"}]
+				EnterCountryTime:[{required: true, message:this.$t('rule.EnterRJRQ'), trigger: "blur"}],
+				LeaveCountryTime:[{required: true, message:this.$t('rule.EnterCJRQ'), trigger: "blur"}]
 			},
             VisaApplyForTypeEnum:[],
             JapanAirportList:[],
@@ -423,9 +423,9 @@ export default {
             }
         },        
     	deleteCustomer(obj){
-			this.$confirm('是否删除?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
+			this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
+				confirmButtonText: this.$t('pub.sureBtn'),
+				cancelButtonText: this.$t('pub.cancelBtn'),
 				type: 'warning'
 			}).then(() => {
 				this.apipost('app_customer_Remove',{ID:obj.customerId},res=>{
@@ -435,7 +435,7 @@ export default {
 					}
 				},err=>{})
 			}).catch(() => {
-				this.$message.info('已取消删除！');
+				this.$message.info(this.$t('tips.cancleDelete'));
 			});
     	},
         getList(){  // 获取列表数据

src/components/index.vue

@@ -230,7 +230,7 @@
                   <el-dropdown-menu  class="changelanguage" slot="dropdown">
                     <el-dropdown-item @click.native="ChangeLan('Japanese')">日语 <i v-if="language=='Japanese'" class="iconfont icon-duigou"></i></el-dropdown-item>
                     <el-dropdown-item @click.native="ChangeLan('zh-CN')">简体中文 <i v-if="language=='zh-CN'" class="iconfont icon-duigou"></i></el-dropdown-item>
-                    <el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'" class="iconfont"></i></el-dropdown-item>
+                    <el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'" class="iconfont icon-duigou"></i></el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </li>