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

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

@@ -8,7 +8,30 @@
         v-model="formData"
         :rules="rules"
         :sections="sections"
-      />
+      >
+       <template v-slot:ExtLockRsp_SDK="{ formData }">
+      <!-- 插槽内容有el-form-item组件包裹 -->
+      <el-select v-model="formData.ExtLockRsp_SDK" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
+                <el-option
+                  v-for="item in province"
+                  :key="item.AccountID"
+                  :label="item.Name"
+                  :value="item.ExtSocialUnifiedCreditCode_SDK"
+                />
+              </el-select>
+    </template>
+      <template v-slot:ExtLockCity_SDK="{ formData }">
+      <!-- 插槽内容有el-form-item组件包裹 -->
+      <el-select v-model="formData.ExtLockCity_SDK" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
+                <el-option
+                  v-for="item in apptions"
+                  :key="item.Code"
+                  :label="item.Name"
+                  :value="item.Code"
+                />
+              </el-select>
+    </template>
+      </ele-form-section>
      <div class="table-contain">
       <div class="form-container">审批意见</div>
        <div class="btn">
@@ -18,16 +41,16 @@
        <el-table :data="tableData"
                   border
                   style="width: 100%">
-          <el-table-column prop="Status"
+          <el-table-column prop="node"
                            label="审批节点">
           </el-table-column>
-          <el-table-column prop="Name"
+          <el-table-column prop="result"
                            label="审批结果">
           </el-table-column>
-          <el-table-column prop="OperName"
+          <el-table-column prop="createOn_SDK"
                            label="审批时间">
           </el-table-column>
-          <el-table-column prop="CreditCode"
+          <el-table-column prop="note"
                            label="备注">
           </el-table-column>
         </el-table>
@@ -57,6 +80,7 @@
 import Title from '@/components/Title'
 import { getCustomer,typeSearch,lockRsp,ProcessApproval,processHistory } from '@/api/customers';
 import Pagination from '@/components/Pagination'
+import { Country } from '@/api/qcc'
 export default {
   components: {
     Pagination,
@@ -223,7 +247,7 @@ export default {
               label: '签约渠道类型',
               layout: 12,
               options: async data => {
-                const res = await typeSearch({code:'ExtChannelType_SDK',module:'Customer'})
+                const res = await typeSearch({code:'ExtChannelType_SDK',module:'Customer',content:'CCP'})
                 var result = res.map(item => {
                   return {
                     text: item.content,
@@ -254,17 +278,20 @@ export default {
             extStartDate_SDK: {
               type: 'date',
               label: '初始合作开始时间',
-              layout: 12
+              layout: 12,
+              disabled:true
             },
             extAuthenticationDate_SDK: {
               type: 'date',
               label: '高级认证日期',
-              layout: 12
+              layout: 12,
+               disabled:true
             },
             extEndDate_SDK: {
               type: 'date',
               label: '合作终止日期',
-              layout: 12
+              layout: 12,
+               disabled:true
             },
             
           }
@@ -273,14 +300,12 @@ export default {
        tableData:[],
        TotalRecords:0,
        page:{},
+       apptions:[],
       // 同 vue-ele-form
       rules: {
-        Name: {required: true, message: '名称必填'},
-        ExtSocialUnifiedCreditCode_SDK: { required: true, message: '名称必填' },
-        ExtSocialUnifiedCreditCode_SDK: { required: true, message: '名称必填' },
-        ExtRegisteredCapital_SDK: {required: true, message: '名称必填' },
-        ExtCorporateName_SDK: { required: true, message: '名称必填' },
-
+        ExtChannelType_SDK: {required: true, message: '请选择签约渠道类型'},
+        ExtLockRsp_SDK: { required: true, message: '请选择锁定RSP' },
+        ExtLockCity_SDK: { required: true, message: '请选择城市覆盖范围' },
       }
     }
   },
@@ -296,6 +321,13 @@ export default {
     getList(){
        getCustomer({objectID:this.id}).then((resp)=>{
             this.formData=resp.results[0]
+            lockRsp({extProvince_SDK: resp.results[0].ExtProvince_SDK}).then((resp)=>{
+            this.province=resp.results  
+       }) 
+       const app={provinceCode:resp.results[0].ExtProvince_SDK}
+       this.$request(Country.searchCity,app).then((resp) => {
+        this.apptions=resp.results
+      })
        })
     },
     getHistoryList(){
@@ -303,11 +335,7 @@ export default {
             this.tableData=resp.results
        })
     },
-    selectList(){
-       lockRsp({ExtProvince_SDK: this.formData.ExtProvince_SDK}).then((resp)=>{
-            console.log('ddddd',resp)
-       })
-    },
+
     handleSuccess () {
       // this.$message.success('创建成功')
     },

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

@@ -14,9 +14,9 @@
       <el-select v-model="formData.ExtLockCity_SDK" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in province"
-                  :key="item.AccountID"
+                 :key="item.Code"
                   :label="item.Name"
-                  :value="item.ExtSocialUnifiedCreditCode_SDK"
+                  :value="item.Code"
                 />
               </el-select>
     </template>
@@ -30,16 +30,16 @@
        <el-table :data="tableData"
                   border
                   style="width: 100%">
-          <el-table-column prop="Status"
+          <el-table-column prop="node"
                            label="审批节点">
           </el-table-column>
-          <el-table-column prop="Name"
+          <el-table-column prop="result"
                            label="审批结果">
           </el-table-column>
-          <el-table-column prop="OperName"
+          <el-table-column prop="createOn_SDK"
                            label="审批时间">
           </el-table-column>
-          <el-table-column prop="CreditCode"
+          <el-table-column prop="note"
                            label="备注">
           </el-table-column>
         </el-table>
@@ -237,13 +237,13 @@ export default {
               layout: 12,
               disabled:true
             },
-            ExtLockRsp_SDK: {
+            ExtLockRsp_KUT: {
               type: 'input',
               label: '签约产品组',
               layout: 12,
               disabled:true
             },
-            ExtTotalAgent_SDK: {
+            ExtTotalAgent_KUT: {
               type: 'input',
               label: '签约总代',
               layout: 12,
@@ -282,12 +282,7 @@ export default {
        page:{},
       // 同 vue-ele-form
       rules: {
-        Name: {required: true, message: '名称必填'},
-        ExtSocialUnifiedCreditCode_SDK: { required: true, message: '名称必填' },
-        ExtSocialUnifiedCreditCode_SDK: { required: true, message: '名称必填' },
-        ExtRegisteredCapital_SDK: {required: true, message: '名称必填' },
-        ExtCorporateName_SDK: { required: true, message: '名称必填' },
-
+        ExtLockCity_SDK: {required: true, message: '请选择覆盖城市范围'},
       }
     }
   },
@@ -309,10 +304,6 @@ export default {
     getList(){
        getCustomer({objectID:this.id}).then((resp)=>{
             this.formData=resp.results[0]
-      //       lockRsp({extProvince_SDK: resp.results[0].ExtProvince_SDK}).then((resp)=>{
-      //       this.province=resp.results
-            
-      //  }) 
        const app={provinceCode:resp.results[0].ExtProvince_SDK}
        this.$request(Country.searchCity,app).then((resp) => {
         this.province=resp.results

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

@@ -7,6 +7,7 @@
       <el-form id="registerForm"
                :model="formData"
                status-icon
+               ref="formData"
                :rules="supplierBaseRules"
                label-position="right">
         <el-row class="border-bottom">
@@ -264,12 +265,11 @@
                   :offset="1"
                   class="padding-bottom">
             <el-form-item label="营业执照:"
-                          prop="financerMobile"
+                          prop="filelll"
                           label-width="100px"
                           class="filter-icon-none"
-                          required>
+                          >
               <el-upload class="upload-demo"
-                        :headers="myHeader"
                         :on-change="handleChange"
                          action="https://jsonplaceholder.typicode.com/posts/"
                          multiple
@@ -375,7 +375,7 @@ export default {
         extUnis_SDK: [{ required: true, message: '请输入Unis业务负责人姓名', trigger: 'blur' }],  
         extUnisPhone_SDK: [{ required: true, message: '请输入Unis业务负责人电话', trigger: 'blur' }],  
         extUnisEmail_SDK: [{ required: true, message: '请输入Unis业务负责人邮箱', trigger: 'blur' },
-         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],  
+         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],    
       },
       dialogTableVisible: false,
       TotalRecords:0,
@@ -433,6 +433,17 @@ export default {
       })
     },
     handleApprove(){
+       this.$refs.formData.validate((valid) => {
+          if (valid) {
+           this.aOptions.forEach(el=>{
+           this.formData.ExtProvinceName_SDK=el[this.formData.extProvince_SDK]
+        })
+          this.bOptions.forEach(el=>{
+           this.formData.extCityName_SDK=el[this.formData.extCity_SDK]
+        })
+          this.cOptions.forEach(el=>{
+           this.formData.extDistrictName_SDK=el[this.formData.extDistrict_SDK]
+        })
       this.formData.ExtCustomerType_SDK=111
       // this.loading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
@@ -445,6 +456,11 @@ export default {
           this.$message.error('提交失败！')
         }
       })
+          } else {
+            return false;
+          }
+        });
+       
     },
      handleClickGoBack() {
       // const visitedViews = this.$store.state.tagsView.visitedViews

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

@@ -289,7 +289,7 @@
           </el-col>
           <el-col  :span="12"  class="padding-bottom">
             <el-form-item label="签约产品组:" prop="ExtProductGroup_SDK" label-width="120px"  >
-              <el-select v-model="formData.ExtProductGroup_SDK" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
+              <el-select v-model="formData.ExtProductGroup_KUT" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in bOptions"
                   :key="item.id"
@@ -301,7 +301,7 @@
           </el-col>
           <el-col :span="11"  :offset="1" class="padding-bottom">
             <el-form-item label="签约总代:" prop="extTotalAgent_SDK" label-width="100px" >
-             <el-select v-model="formData.extTotalAgent_SDK" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
+             <el-select v-model="formData.ExtTotalAgent_KUT" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in cOptions"
                   :key="item.id"
@@ -321,17 +321,17 @@
                   :offset="1"
                   class="padding-bottom">
             <el-form-item label="营业执照:"
-                          prop="financerMobile"
+                          prop="filelss"
                           label-width="100px"
                           class="filter-icon-none"
-                          required>
+                          >
              <el-upload
         ref="uploadExcel"
         action="https://jsonplaceholder.typicode.com/posts/"
         :limit='1'
         :auto-upload="false"
         :on-change="fileChange"
-        :file-list="fileList">
+        >
         <el-button size="small" type="primary">点击上传</el-button>
       </el-upload>
             </el-form-item>
@@ -339,7 +339,7 @@
         </el-row>
           <el-row>
         <el-col align="center">
-          <el-button type="primary" :loading="loading" @click="handleApprove(formData)">提交</el-button>
+          <el-button type="primary" :loading="loading" @click="handleApprove()">提交</el-button>
         </el-col>
       </el-row>
       </el-form>
@@ -481,11 +481,11 @@ export default {
        this.$request(Common.searchUrl, adata).then((resp) => {
         this.aOptions=resp
       })
-       const bdata={code:'ExtProductGroup_SDK',module:'Customer'}
+       const bdata={code:'ExtProductGroup_KUT',module:'Customer'}
        this.$request(Common.searchUrl, bdata).then((resp) => {
         this.bOptions=resp
       })
-       const cdata={code:'ExtTotalAgent_SDK',module:'Customer'}
+       const cdata={code:'ExtTotalAgent_KUT',module:'Customer'}
        this.$request(Common.searchUrl, cdata).then((resp) => {
         this.cOptions=resp
       })
@@ -515,17 +515,19 @@ export default {
       this.dialogTableVisible = false
       })
     },
-    handleApprove(formName){ 
-        // this.$refs[formName].validate((valid) => {
-        //   if (valid) {
-        //     alert('submit!');
-        //   } else {
-        //     console.log('error submit!!');
-        //     return false;
-        //   }
-        // });
-          
-        this.formData. ExtCustomerType_SDK=101
+    handleApprove(){ 
+        this.$refs.formData.validate((valid) => {
+          if (valid) {
+          this.aOptions.forEach(el=>{
+           this.formData.ExtProvinceName_SDK=el[this.formData.extProvince_SDK]
+        })
+          this.bOptions.forEach(el=>{
+           this.formData.extCityName_SDK=el[this.formData.extCity_SDK]
+        })
+          this.cOptions.forEach(el=>{
+           this.formData.extDistrictName_SDK=el[this.formData.extDistrict_SDK]
+        })
+        this.formData.ExtCustomerType_SDK=101
         // this.loading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
         //  this.loading=false
@@ -538,6 +540,11 @@ export default {
         
         
       })
+          } else {
+            return false;
+          }
+        });
+        
     },
       handleClickGoBack() {
       // const visitedViews = this.$store.state.tagsView.visitedViews