Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/views/customers/citypotenial-list/index.vue

@@ -53,7 +53,6 @@
           <el-select v-if="formData.ExtProcessNode_SDK==2"
                      v-model="formData.ExtChannelType_SDK"
                      style="width: 91%"
-               
                      placeholder="请选择"
                      no-match-text="无匹配数据">
             <el-option v-for="item in cOptions"
@@ -97,7 +96,7 @@
         <div class="form-container">审批意见</div>
         <div class="btn">
           <el-button type="primary"
-                     @click="approve">审批</el-button>
+                     @click="approve">确认</el-button>
           <el-button type=""
                      @click="reject">退回</el-button>
         </div>
@@ -165,7 +164,10 @@ export default {
       status: 0,
       loading: false,
       tableData2: [],
-      formData: {},
+      formData: {
+        ExtLockRsp_SDK:[],
+        ExtLockCity_SDK:[],
+      },
       province: [],
       sections: [
         {
@@ -340,8 +342,8 @@ export default {
       // 同 vue-ele-form
       rules: {
         ExtChannelType_SDK: {required: true, message: '请选择签约渠道类型',trigger: 'change'  },
-        ExtLockRsp_SDK: { required: true, message: '请选择锁定RSP' },
-        ExtLockCity_SDK: { required: true, message: '请选择城市覆盖范围' },
+        ExtLockRsp_SDK: { required: true, message: '请选择锁定RSP',trigger: 'change' },
+        ExtLockCity_SDK: { required: true, message: '请选择城市覆盖范围',trigger: 'change' },
       }
     }
   },
@@ -370,9 +372,9 @@ export default {
       this.loading=true
       getCustomer({ objectID: this.id }).then((resp) => {
         this.loading=false
-        resp.results[0].ExtChannelType_SDK=null
-        resp.results[0].ExtChannelType_SDKText=null
         this.formData = resp.results[0]
+        this.formData.ExtLockRsp_SDK=[]
+        this.formData.ExtLockCity_SDK=[]
         lockRsp({ extProvince_SDK: resp.results[0].ExtProvince_SDK }).then((resp) => {
           this.province = resp.results
         })
@@ -427,8 +429,13 @@ export default {
       // this.$message.success('创建成功')
     },
     approve() {
-      this.dialogFormVisible = true
-      this.status = 1
+      if(this.formData.ExtLockRsp_SDK.length==0||this.formData.ExtLockCity_SDK.length==0||this.formData.ExtChannelType_SDK.length==0){
+        return this.$message.warning('请输入必填信息')
+      }else{
+        this.dialogFormVisible = true
+        this.status = 1
+      }
+    
     },
     reject() {
       this.dialogFormVisible = true

src/views/customers/potential-list/index.vue

@@ -59,7 +59,7 @@
         <div class="form-container">审批意见</div>
         <div class="btn">
           <el-button type="primary"
-                     @click="approve">审批</el-button>
+                     @click="approve">确认</el-button>
           <el-button type=""
                      @click="reject">退回</el-button>
         </div>
@@ -126,7 +126,9 @@ export default {
       id: '',
       status: 0,
       loading: false,
-      formData: {},
+      formData: {
+        ExtLockCity_SDK:[]
+      },
       province: [],
       tableData2: [],
       sections: [
@@ -343,6 +345,7 @@ export default {
       getCustomer({ objectID: this.id }).then((resp) => {
         this.loading=false
         this.formData = resp.results[0]
+        this.formData.ExtLockCity_SDK=[]
         const app = { provinceCode: resp.results[0].ExtProvince_SDK }
         this.$request(Country.searchCity, app).then((resp) => {
           this.province = resp.results
@@ -372,8 +375,14 @@ export default {
       // this.$message.success('创建成功')
     },
     approve() {
-      this.dialogFormVisible = true
-      this.status = 1
+      console.log('formdadada',this.formData)
+      if(this.formData.ExtLockCity_SDK.length==0){
+        return this.$message.warning('请输入必填信息')
+      }else{
+         this.dialogFormVisible = true
+         this.status = 1
+      }
+     
     },
     reject() {
       this.dialogFormVisible = true

src/views/login/city-register/index.vue

@@ -8,7 +8,7 @@
                :model="formData"
                status-icon
                ref="formData"
-                v-loading="btnloading"
+               v-loading="btnloading"
                :rules="supplierBaseRules"
                label-position="right">
         <el-row class="border-bottom">
@@ -327,7 +327,7 @@
         </el-table>
         <pagination v-show="TotalRecords>0"
                     :total="TotalRecords"
-                    :page.sync="page.PageIndex"
+                    :page.sync="page.currentPage"
                     :limit.sync="page.pageSize"
                     @pagination="getList" />
       </el-dialog>
@@ -359,9 +359,9 @@ export default {
       cityOptions: [],
       disOptions: [],
       supplierBaseRules: {
-        extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码',trigger:'blur' }],
+        extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
         // extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)',trigger:'blur' }],
-        extCorporateName_SDK: [{ required: true, message: '请输入法人',trigger:'blur' }],
+        extCorporateName_SDK: [{ required: true, message: '请输入法人', trigger: 'blur' }],
         extProvince_SDK: [{ required: true, message: '请选择省份' }],
         extCity_SDK: [{ required: true, message: '请选择市' }],
         extDistrict_SDK: [{ required: true, message: '请选择区' }],
@@ -379,9 +379,8 @@ export default {
       dialogTableVisible: false,
       TotalRecords: 0,
       page: {
-        currentPage: 0,
-        pageSize: 0,
-
+        pageSize: 10,
+        currentPage: 1
       }
 
     }
@@ -400,11 +399,14 @@ export default {
   methods: {
     getList() {
       this.page.searchKey = this.formInline.Name
+      delete this.page.TotalRecords
+      this.page.PageIndex = 0
       this.$request(Qcc.searchUrl, this.page).then((resp) => {
         if (resp.results.Result) {
           this.tableData = resp.results.Result
           this.page = resp.results.Paging
-          this.TotalRecords = resp.results.Paging.TotalRecords
+          this.page.currentPage = this.page.PageIndex
+          this.TotalRecords = this.page.TotalRecords
         } else {
           this.$message.warning('无相关公司！')
         }
@@ -466,32 +468,28 @@ export default {
       this.$refs.formData.validate((valid) => {
         if (valid) {
           this.formData.extCustomerType_SDK = 111
-           this.$confirm('确认是否提交', '提示', {
-                  confirmButtonText: '确定',
-                  cancelButtonText:'取消',
-                  type: 'warning'
-                }).then(() => {
-                  this.btnloading = true
-                this.$request(Customer.searchUrl, this.paramsToFormData(this.formData)).then((resp) => {
-                this.btnloading = false
-               this.$message.success('提交成功！')
-                this.$router.back()
-               }).catch((err) => {
-                  this.btnloading = false
-                   })     
-                }).catch((err)=>{
-                  this.btnloading = false
-                  this.loading = false
-                })
-        
-        } else {
+
+          this.btnloading = true
+          this.$request(Customer.searchUrl, this.paramsToFormData(this.formData)).then((resp) => {
+            this.btnloading = false
+            this.$message.success('提交成功！')
+            //  setTimeout(function(){
+            //    console.log('延时两秒')
+　　           window.location.href="about:blank";
+               window.close(); 
+// 　　         },20000);
+          }).catch((err) => {
             this.btnloading = false
-           if (this.formData.file == null || this.formData.file == '' || this.formData.file == []) {
+          })
+
+        } else {
+          this.btnloading = false
+          if (this.formData.file == null || this.formData.file == '' || this.formData.file == []) {
             return this.$message.warning('请上传附件')
-          }else{
+          } else {
             this.$message.warning('请输入必填信息！')
           }
-          
+
         }
       });
 
@@ -533,8 +531,8 @@ export default {
       this.supplierBaseRules.file = []
     },
     handleRemoveFile(res, file) {
-      this.formData.file=null
-      this.supplierBaseRules.file = [{ required: true, message: '请上传附件'}]
+      this.formData.file = null
+      this.supplierBaseRules.file = [{ required: true, message: '请上传附件' }]
     },
   }
 }

src/views/login/prov-register/index.vue

@@ -18,6 +18,7 @@
           <el-col :span="13"
                   class="padding-bottom">
             <el-form-item label="公司全称:"
+                          prop="Name"
                           label-width="150px">
               <el-input v-model="formData.name"
                         readonly
@@ -304,7 +305,6 @@
                           label-width="120px">
               <el-select v-model="formData.extChannelType_SDK"
                          style="width: 91%"
-                         filterable
                          placeholder="请选择"
                          no-match-text="无匹配数据">
                 <el-option v-for="item in aOptions"
@@ -322,7 +322,6 @@
               <el-select v-model="formData.extProductGroup_KUT"
                          style="width: 91%"
                          multiple
-                         filterable
                          placeholder="请选择"
                          no-match-text="无匹配数据"
                          @change="handSelect2">
@@ -370,7 +369,7 @@
               <el-upload ref="uploadExcel"
                          action="false"
                          :limit='1'
-                         :auto-upload= 'false'
+                         :auto-upload='false'
                          :on-remove="handleRemoveFile"
                          :on-change="fileChange">
                 <el-button size="small"
@@ -445,7 +444,10 @@ export default {
   },
   data() {
     return {
-      formData: {},
+      formData: {
+        extProductGroup_KUT: [],
+        extTotalAgent_KUT: []
+      },
       inputEnter: false,
       countryArea: '',
       formInline: {},
@@ -456,13 +458,13 @@ export default {
       countryOptions: [],
       cityOptions: [],
       disOptions: [],
-      aOptions: [],
-      bOptions: [],
-      cOptions: [],
+      aOptions: '',
+      bOptions: '',
+      cOptions: '',
       supplierBaseRules: {
-        extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码',trigger:'blur' }],
+        extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
         // extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)' }],
-        extCorporateName_SDK: [{ required: true, message: '请输入法人',trigger:'blur' }],
+        extCorporateName_SDK: [{ required: true, message: '请输入法人', trigger: 'blur' }],
         extProvince_SDK: [{ required: true, message: '请选择省份' }],
         extCity_SDK: [{ required: true, message: '请选择市' }],
         extDistrict_SDK: [{ required: true, message: '请选择区' }],
@@ -479,16 +481,16 @@ export default {
         extBusinessPhone_SDK: [{ required: true, message: '请输入商务负责人电话', trigger: 'blur' }],
         extBusinessEmail_SDK: [{ required: true, message: '请输入商务负责人邮箱', trigger: 'blur' },
         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
-        extChannelType_SDK: [{ required: true, message: '请选择签约渠道类型' }],
-        extProductGroup_KUT: [{ required: true, message: '请选择签约产品组' }],
-        extTotalAgent_KUT: [{ required: true, message: '请选择签约总代' }],
+        extChannelType_SDK: [{ required: true, message: '请选择签约渠道类型', trigger: 'change' }],
+        extProductGroup_KUT: [{ required: true, message: '请选择签约产品组', trigger: ["blur", 'change'] }],
+        extTotalAgent_KUT: [{ required: true, message: '请选择签约总代', trigger: ["blur", 'change'] }],
         file: [{ required: true, message: '请上传附件' }],
       },
       dialogTableVisible: false,
       TotalRecords: 0,
       page: {
-        currentPage: 0,
-        pageSize: 0
+        pageSize: 10,
+        currentPage: 1
       }
 
     }
@@ -502,6 +504,7 @@ export default {
     },
   },
   created() {
+    this.$refs.formData && this.$refs.formData.resetFields();
     this.selectCountry()
     this.getCommon()
   },
@@ -510,14 +513,17 @@ export default {
 
     getList() {
       this.page.searchKey = this.formInline.Name
+      delete this.page.TotalRecords
+      this.page.PageIndex = 0
       this.$request(Qcc.searchUrl, this.page).then((resp) => {
-        if(resp.results.Result){
+        if (resp.results.Result) {
           this.tableData = resp.results.Result
-        this.page = resp.results.Paging
-        this.TotalRecords = resp.results.Paging.TotalRecords
-        }else{
+          this.page = resp.results.Paging
+          this.page.currentPage = this.page.PageIndex
+          this.TotalRecords = this.page.TotalRecords
+        } else {
           this.$message.warning('无相关公司！')
-        } 
+        }
       })
     },
     selectCountry() {
@@ -626,29 +632,22 @@ export default {
           this.formData.extProductGroup_SDK = ExtProductGroup_SDK
           this.formData.extTotalAgent_KUT = ExtTotalAgent_KUT
           this.formData.extTotalAgent_SDK = ExtTotalAgent_SDK
-         
-          this.$confirm('确认是否提交', '提示',{confirmButtonText: '确定',
-                  cancelButtonText:'取消',
-                  type: 'warning'}).then(()=>{
-                     this.btnloading = true
-                this.$request(Customer.searchUrl, this.paramsToFormData(this.formData)).then((resp) => {
-                this.btnloading = false
-                this.$message.success('提交成功！')
-                this.$router.back()
-
+          this.btnloading = true
+          this.$request(Customer.searchUrl, this.paramsToFormData(this.formData)).then((resp) => {
+            this.btnloading = false
+            this.$message.success('提交成功！')
+            setTimeout(function(){
+　　            this.$router.back()
+　　         },20000);
+  
           }).catch((err) => {
             this.btnloading = false
           })
-             }).catch(()=>{
-               this.btnloading = false
-                this.loading = false
-             })
-          
         } else {
-           this.btnloading = false
-           if (this.formData.file == null || this.formData.file == '' || this.formData.file == []) {
+          this.btnloading = false
+          if (this.formData.file == null || this.formData.file == '' || this.formData.file == []) {
             return this.$message.warning('请上传附件')
-          }else{
+          } else {
             this.$message.warning('请输入必填信息！')
           }
         }
@@ -687,10 +686,10 @@ export default {
       this.dialogTableVisible = false
     },
     fileChange(res, file) {
-        this.formData.file = res.raw
-        this.supplierBaseRules.file=[]
+      this.formData.file = res.raw
+      this.supplierBaseRules.file = []
     },
-    handleRemoveFile(res,file){ 
+    handleRemoveFile(res, file) {
       this.formData.file = null
       this.supplierBaseRules.file = [{ required: true, message: '请上传附件' }]
     },