1

src/components/SalesModule/MyCustomer.vue

@@ -683,7 +683,7 @@
               <el-input v-model="addMsg.Email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
+          <el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252">
             <el-form-item :label="$t('pub.area')">
               <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'>
@@ -699,6 +699,14 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6" v-if="currentUserInfo&& currentUserInfo.RB_Branch_id ==1252">
+            <el-form-item :label="$t('fnc.khleixing')" prop="IsMember">
+              <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="2" :label="$t('salesModule.NormalCustomer')" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('hotel.hotel_detailinfo')" prop="address">
               <el-input v-model="addMsg.address" :placeholder="$t('salesModule.HouseNumber')" maxlength="50"></el-input>
@@ -738,7 +746,7 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="6" v-if="currentUserInfo&& currentUserInfo.RB_Branch_id !=1252">
               <el-form-item :label="$t('objFill.pingtaiyhm')">
                 <div style="display: flex;flex-wrap: nowrap;justify-content: space-between;">
                   <div style="display: flex; flex-wrap: wrap;align-items: center;">
@@ -757,7 +765,7 @@
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
+            <el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252">
               <el-form-item :label="$t('objFill.qianyueyjkh')" prop="SigningType">
                 <div style="display: flex;flex-wrap: nowrap;">
                   <div>
@@ -794,7 +802,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
+            <el-col :span="4" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252">
               <el-form-item :label="$t('salesModule.Belongbrand')" prop="brandIds">
                 <el-select filterable class='multiple_input' multiple v-model='addMsg.brandIds'
                   :placeholder="$t('pub.pleaseSel')">
@@ -939,7 +947,7 @@
               </span>
             </p>
           </el-col>
-          <el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
+          <el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2&& currentUserInfo.RB_Branch_id !=1252">
             <el-form-item :label="$t('system.quety_area')">
               <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'>
@@ -955,6 +963,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+          
           <el-col :span="8">
             <el-form-item :label="$t('hotel.hotel_detailinfo')">
               <el-input v-model='updateMsg.Address' maxlength="50"></el-input>
@@ -993,7 +1002,7 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
+          <el-col :span="8" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252">
             <el-form-item :label="$t('objFill.pingtaiyhm')">
               <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;">
@@ -1108,7 +1117,8 @@
           UniqueCode: '',
           LINEID: '',
           Email: '',
-          PlatformUserNameList: []
+          PlatformUserNameList: [],
+          IsMember:''
         },
         addMsgS: {
           isPreFilled: true,
@@ -1165,6 +1175,11 @@
             message: this.$t('rule.EnterCusName'),
             trigger: "blur"
           }],
+          IsMember:[{
+            required: true,
+            message: this.$t('objFill.qingxuanzhekhlx'),
+            trigger: "change"
+          }],
           address: [{
             required: true,
             message: this.$t('visaT.qsradder'),
@@ -1222,7 +1237,8 @@
           uniqueCode: '',
           lineid: '',
           email: '',
-          PlatformUserNameList: []
+          PlatformUserNameList: [],
+          IsMember: ''
         },
         cityList: [],
         regionList: [],
@@ -1893,6 +1909,14 @@
           this.$message.error(this.$t('rule.EnterContratPerson'))
           return
         }
+        if(this.currentUserInfo.RB_Branch_id==1252 && this.addMsg.IsMember!=1&& this.addMsg.IsMember!=2){
+          this.$message.error(this.$t('objFill.qingxuanzhekhlx'))
+          return
+        }
+        if(this.addMsg.IsMember==1 && this.addMsg.BusinessCardPhotos.length==0){
+          this.$message.error(this.$t('objFill.v101.dmc.qingscht'))
+          return
+        }
         if (this.addMsg.SigningType && !this.saveMsg.length) {
           this.$message.error(this.$t('objFill.qingscqycl'))
           return

src/components/SalesModule/customerApproval.vue

@@ -573,6 +573,9 @@
           if (res.data.resultCode == 1) {
             this.openLayer()
             this.detailList = res.data.data.customerInfo
+            if(this.detailList.isMember){
+              this.addMsg.IsMember = this.detailList.isMember
+            }
           } else {}
 
         }, err => {})