Commit 86ec2b93 authored by liudong1993's avatar liudong1993

1

parent bb7f2152
...@@ -699,7 +699,7 @@ ...@@ -699,7 +699,7 @@
<el-input v-model="addMsg.Email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input> <el-input v-model="addMsg.Email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252"> <el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252 && currentUserInfo.RB_Branch_id !=1257">
<el-form-item :label="$t('pub.area')" prop="District"> <el-form-item :label="$t('pub.area')" prop="District">
<el-select class="addMsgSW" filterable v-model='addMsg.Province' @change='getCity'> <el-select class="addMsgSW" filterable v-model='addMsg.Province' @change='getCity'>
<el-option v-for='item in provinceList' :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for='item in provinceList' :label='item.Name' :value='item.ID' :key='item.ID'>
...@@ -715,7 +715,7 @@ ...@@ -715,7 +715,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="currentUserInfo&& currentUserInfo.RB_Branch_id ==1252"> <el-col :span="6" v-if="currentUserInfo&& (currentUserInfo.RB_Branch_id ==1252||currentUserInfo.RB_Branch_id ==1257)">
<el-form-item :label="$t('fnc.khleixing')" prop="IsMember"> <el-form-item :label="$t('fnc.khleixing')" prop="IsMember">
<el-select v-model="addMsg.IsMember" :placeholder="$t('objFill.qingxuanzhekhlx')"> <el-select v-model="addMsg.IsMember" :placeholder="$t('objFill.qingxuanzhekhlx')">
<el-option key="1" :label="$t('salesModule.MemberCustomer')" value="1"></el-option> <el-option key="1" :label="$t('salesModule.MemberCustomer')" value="1"></el-option>
...@@ -762,7 +762,7 @@ ...@@ -762,7 +762,7 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="currentUserInfo&& currentUserInfo.RB_Branch_id !=1252"> <el-col :span="6" v-if="currentUserInfo&& currentUserInfo.RB_Branch_id !=1252&& currentUserInfo.RB_Branch_id !=1257">
<el-form-item :label="$t('objFill.pingtaiyhm')"> <el-form-item :label="$t('objFill.pingtaiyhm')">
<div style="display: flex;flex-wrap: nowrap;justify-content: space-between;"> <div style="display: flex;flex-wrap: nowrap;justify-content: space-between;">
<div style="display: flex; flex-wrap: wrap;align-items: center;"> <div style="display: flex; flex-wrap: wrap;align-items: center;">
...@@ -781,7 +781,7 @@ ...@@ -781,7 +781,7 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252"> <el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252&& currentUserInfo.RB_Branch_id !=1257">
<el-form-item :label="$t('objFill.qianyueyjkh')" prop="SigningType"> <el-form-item :label="$t('objFill.qianyueyjkh')" prop="SigningType">
<div style="display: flex;flex-wrap: nowrap;"> <div style="display: flex;flex-wrap: nowrap;">
<div> <div>
...@@ -818,7 +818,7 @@ ...@@ -818,7 +818,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252"> <el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252&& currentUserInfo.RB_Branch_id !=1257">
<el-form-item :label="$t('salesModule.Belongbrand')" prop="brandIds"> <el-form-item :label="$t('salesModule.Belongbrand')" prop="brandIds">
<el-select filterable class='multiple_input' multiple v-model='addMsg.brandIds' <el-select filterable class='multiple_input' multiple v-model='addMsg.brandIds'
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
...@@ -963,7 +963,7 @@ ...@@ -963,7 +963,7 @@
</span> </span>
</p> </p>
</el-col> </el-col>
<el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2&& currentUserInfo.RB_Branch_id !=1252"> <el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2&& currentUserInfo.RB_Branch_id !=1252&& currentUserInfo.RB_Branch_id !=1257">
<el-form-item :label="$t('system.quety_area')" prop="District"> <el-form-item :label="$t('system.quety_area')" prop="District">
<el-select class="updateMsgSw" filterable v-model='updateMsg.Province' @change='getCityNew'> <el-select class="updateMsgSw" filterable v-model='updateMsg.Province' @change='getCityNew'>
<el-option v-for='item in provinceList' :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for='item in provinceList' :label='item.Name' :value='item.ID' :key='item.ID'>
...@@ -1018,7 +1018,7 @@ ...@@ -1018,7 +1018,7 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252"> <el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252&& currentUserInfo.RB_Branch_id !=1257">
<el-form-item :label="$t('objFill.pingtaiyhm')"> <el-form-item :label="$t('objFill.pingtaiyhm')">
<el-tag :key="tag" v-for="tag in updateMsg.PlatformUserNameList" closable :disable-transitions="false" <el-tag :key="tag" v-for="tag in updateMsg.PlatformUserNameList" closable :disable-transitions="false"
@close="handleClose(tag)" size="small" style="margin-right: 5px;margin-bottom: 3px;"> @close="handleClose(tag)" size="small" style="margin-right: 5px;margin-bottom: 3px;">
...@@ -1436,7 +1436,7 @@ ...@@ -1436,7 +1436,7 @@
} }
} }
this.updateMsg.SigningType = this.updateMsg.SigningType ? 1 : 0 this.updateMsg.SigningType = this.updateMsg.SigningType ? 1 : 0
if (this.currentUserInfo&&this.currentUserInfo.RB_Group_id==2&& this.currentUserInfo.RB_Branch_id !=1252&&(this.updateMsg.Province == ''||this.updateMsg.City == ''||this.updateMsg.District == ''||!this.updateMsg.District)) { if (this.currentUserInfo&&this.currentUserInfo.RB_Group_id==2&& this.currentUserInfo.RB_Branch_id !=1252&& currentUserInfo.RB_Branch_id !=1257&&(this.updateMsg.Province == ''||this.updateMsg.City == ''||this.updateMsg.District == ''||!this.updateMsg.District)) {
this.$message.error(this.$t('objFill.v101.LeaveGroupDownload.qingxzssq')) this.$message.error(this.$t('objFill.v101.LeaveGroupDownload.qingxzssq'))
return return
} }
...@@ -1940,7 +1940,7 @@ ...@@ -1940,7 +1940,7 @@
this.$message.error(this.$t('rule.EnterContratPerson')) this.$message.error(this.$t('rule.EnterContratPerson'))
return return
} }
if(this.currentUserInfo.RB_Branch_id==1252 && this.addMsg.IsMember!=1&& this.addMsg.IsMember!=2){ if(this.currentUserInfo.RB_Branch_id==1252&& currentUserInfo.RB_Branch_id !=1257 && this.addMsg.IsMember!=1&& this.addMsg.IsMember!=2){
this.$message.error(this.$t('objFill.qingxuanzhekhlx')) this.$message.error(this.$t('objFill.qingxuanzhekhlx'))
return return
} }
...@@ -1964,7 +1964,7 @@ ...@@ -1964,7 +1964,7 @@
return return
} }
} }
if (this.currentUserInfo&&this.currentUserInfo.RB_Group_id==2&& this.currentUserInfo.RB_Branch_id !=1252&&(this.addMsg.Province == ''||this.addMsg.City == ''||this.addMsg.District == ''||!this.addMsg.District)) { if (this.currentUserInfo&&this.currentUserInfo.RB_Group_id==2&& this.currentUserInfo.RB_Branch_id !=1252&& currentUserInfo.RB_Branch_id !=1257&&(this.addMsg.Province == ''||this.addMsg.City == ''||this.addMsg.District == ''||!this.addMsg.District)) {
this.$message.error(this.$t('objFill.v101.LeaveGroupDownload.qingxzssq')) this.$message.error(this.$t('objFill.v101.LeaveGroupDownload.qingxzssq'))
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment