Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/MyCustomer.vue

@@ -684,7 +684,7 @@
             </el-form-item>
           </el-col>
           <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-form-item :label="$t('pub.area')" prop="District">
               <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>
@@ -948,7 +948,7 @@
             </p>
           </el-col>
           <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-form-item :label="$t('system.quety_area')" prop="District">
               <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>
@@ -1200,6 +1200,11 @@
             message: this.$t('objFill.qingshureml'),
             trigger: "blur"
           }],
+          District: [{
+            required: true,
+            message: this.$t('objFill.v101.LeaveGroupDownload.qingxzssq'),
+            trigger: "change"
+          }],
         },
         dataList: [],
         CustomerBrandList: [],
@@ -1409,8 +1414,10 @@
           }
         }
         this.updateMsg.SigningType = this.updateMsg.SigningType ? 1 : 0
-        if (this.updateMsg.District == '') {
-          this.updateMsg.District = 0
+        if (this.updateMsg.Province == ''||this.updateMsg.City == ''||this.updateMsg.District == ''||!this.updateMsg.District) {
+          this.$message.error(this.$t('objFill.v101.LeaveGroupDownload.qingxzssq'))
+          // this.updateMsg.District = 0
+          return
         }
         // if (this.BusinessCardPhotos) {
         //   this.updateMsg.BusinessCardPhotos = []
@@ -1933,8 +1940,10 @@
             return
           }
         }
-        if (this.addMsg.District == '') {
-          this.addMsg.District = 0
+        if (this.addMsg.Province == ''||this.addMsg.City == ''||this.addMsg.District == ''||!this.addMsg.District) {
+          this.$message.error(this.$t('objFill.v101.LeaveGroupDownload.qingxzssq'))
+          // this.addMsg.District = 0
+          return
         }
         if (this.HousePhotos) {
           this.addMsg.HousePhotos = []

src/components/index.vue

@@ -2043,7 +2043,7 @@
           res => {
             if (res.data.resultCode == 1) {
               let href = this.domainManager().SalesBoardUrl
-              this.TemplateUrl = `${href}/?uid=${res.data.data}`
+              this.TemplateUrl = `${href}/autoLogin?uid=${res.data.data}`
               this.dialogRankingVisible = true
               if(!localStorage.getItem("RankingTime")||this.RankingTime!=localStorage.getItem("RankingTime")){
                 localStorage.setItem("RankingTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));