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

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

@@ -11,7 +11,7 @@
       >
        <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-select v-model="formData.ExtLockRsp_SDK" :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in province"
                   :key="item.AccountID"
@@ -22,7 +22,7 @@
     </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-select v-model="formData.ExtLockCity_SDK"  :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in apptions"
                   :key="item.Code"
@@ -30,6 +30,17 @@
                   :value="item.Code"
                 />
               </el-select>
+    </template>
+     <template v-slot:ExtChannelType_SDK="{ formData }">
+      <!-- 插槽内容有el-form-item组件包裹 -->
+      <el-select v-model="formData.ExtChannelType_SDK"  :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" filterable placeholder="请选择" no-match-text="无匹配数据">
+                <el-option
+                  v-for="item in cOptions"
+                  :key="item.id"
+                  :label="item.content"
+                  :value="item.keyword"
+                />
+              </el-select>
     </template>
       </ele-form-section>
      <div class="table-contain">
@@ -41,16 +52,16 @@
        <el-table :data="tableData"
                   border
                   style="width: 100%">
-          <el-table-column prop="node"
+          <el-table-column prop="Node"
                            label="审批节点">
           </el-table-column>
-          <el-table-column prop="result"
+          <el-table-column prop="Result"
                            label="审批结果">
           </el-table-column>
-          <el-table-column prop="createOn_SDK"
+          <el-table-column prop="CreateOn_SDK"
                            label="审批时间">
           </el-table-column>
-          <el-table-column prop="note"
+          <el-table-column prop="Note"
                            label="备注">
           </el-table-column>
         </el-table>
@@ -246,16 +257,6 @@ export default {
               type: 'select',
               label: '签约渠道类型',
               layout: 12,
-              options: async data => {
-                const res = await typeSearch({code:'ExtChannelType_SDK',module:'Customer',content:'CCP'})
-                var result = res.map(item => {
-                  return {
-                    text: item.content,
-                    value: item.keyword
-                  }
-                })
-                return result
-              },
             },
             ExtLockRsp_SDK: {
               type: 'select',
@@ -301,6 +302,7 @@ export default {
        TotalRecords:0,
        page:{},
        apptions:[],
+       cOptions:[],
       // 同 vue-ele-form
       rules: {
         ExtChannelType_SDK: {required: true, message: '请选择签约渠道类型'},
@@ -316,6 +318,7 @@ export default {
      this.id=this.$route.query.id
      this.getList()
      this.getHistoryList()
+     this.getChannelType()
   },
   methods: {
     getList(){
@@ -330,6 +333,11 @@ export default {
       })
        })
     },
+    getChannelType(){
+       typeSearch({code:'ExtChannelType_SDK',module:'Customer',content:'CCP'}).then((resp)=>{
+          this.cOptions=resp
+       }) 
+     },
     getHistoryList(){
        processHistory({businessObjectID:this.id}).then((resp)=>{
             this.tableData=resp.results
@@ -348,12 +356,14 @@ export default {
       this.status=2
     },
     approveClick(){
+      const extLockRsp_SDK=this.formData.ExtLockRsp_SDK.toString()
+      const extLockCity_SDK=this.formData.ExtLockCity_SDK.toString()
      const cc={extProcessNode_SDK:this.formData.ExtProcessNode_SDK,
 extCustomerType_SDK:this.formData.ExtCustomerType_SDK,
 extProvince_SDK:this.formData.ExtProvince_SDK,
 objectID:this.formData.ObjectID,
-extLockRsp_SDK:this.formData.extLockRsp_SDK,
-extLockCity_SDK:this.formData.ExtLockCity_SDK,
+extLockRsp_SDK:extLockRsp_SDK,
+extLockCity_SDK:extLockCity_SDK,
 extChannelType_SDK:this.formData.ExtChannelType_SDK}
       if(this.status==1){
          const add={customerDTO:cc,note:this.form.note,result:"approve"}

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

@@ -11,7 +11,7 @@
       >
       <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-select v-model="formData.ExtLockCity_SDK" :disabled="!formData.ExtProcessNode_SDK==2" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in province"
                  :key="item.Code"
@@ -30,16 +30,16 @@
        <el-table :data="tableData"
                   border
                   style="width: 100%">
-          <el-table-column prop="node"
+          <el-table-column prop="Node"
                            label="审批节点">
           </el-table-column>
-          <el-table-column prop="result"
+          <el-table-column prop="Result"
                            label="审批结果">
           </el-table-column>
-          <el-table-column prop="createOn_SDK"
+          <el-table-column prop="CreateOn_SDK"
                            label="审批时间">
           </el-table-column>
-          <el-table-column prop="note"
+          <el-table-column prop="Note"
                            label="备注">
           </el-table-column>
         </el-table>
@@ -327,12 +327,13 @@ export default {
       this.status=2
     },
     approveClick(){
+      const ExtLockCity_SDK=this.formData.ExtLockCity_SDK.toString()
      const cc={extProcessNode_SDK:this.formData.ExtProcessNode_SDK,
 extCustomerType_SDK:this.formData.ExtCustomerType_SDK,
 extProvince_SDK:this.formData.ExtProvince_SDK,
 objectID:this.formData.ObjectID,
 extLockRsp_SDK:this.formData.extLockRsp_SDK,
-extLockCity_SDK:this.formData.ExtLockCity_SDK,
+extLockCity_SDK:ExtLockCity_SDK,
 extChannelType_SDK:this.formData.ExtChannelType_SDK}
       if(this.status==1){
          const add={customerDTO:cc,note:this.form.note,result:"approve"}

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

@@ -17,7 +17,6 @@
           <el-col :span="13"
                   class="padding-bottom">
             <el-form-item label="公司全称:"
-                          prop="Name"
                           label-width="150px"
                           >
               <el-input v-model="formData.Name"
@@ -360,7 +359,6 @@ export default {
       cityOptions:[],
       disOptions:[],
       supplierBaseRules: {
-        Name: [{ 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' }],
@@ -445,19 +443,21 @@ export default {
         //    this.formData.extDistrictName_SDK=el[this.formData.extDistrict_SDK]
         // })
       this.formData.ExtCustomerType_SDK=111
-      // this.loading=true
+      this.loading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
-        // this.loading=false
+        this.loading=false
         // console.log(resp)
          if(resp.results.length<40){
            this.$message.success('提交成功！')
             this.handleClickGoBack()
         }else{
+          this.loading=false
           this.$message.error('提交失败！')
         }
       })
           } else {
-            return false;
+            this.loading=false
+             this.$message.warning('请输入必填信息！')
           }
         });
        

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

@@ -17,11 +17,10 @@
           <el-col :span="13"
                   class="padding-bottom">
             <el-form-item label="公司全称:"
-                          prop="Name"
-                          readonly
                           label-width="150px"
                           >
               <el-input v-model="formData.Name"
+                        readonly
                         placeholder='请选择公司'
                         style="width: 100%">
                 <i slot="suffix"
@@ -101,7 +100,7 @@
                   :offset="1"
                   class="padding-bottom">
             <el-form-item label="省份:"
-                          prop="extProvinceName_SDK"
+                          prop="extProvince_SDK"
                           label-width="80px"
                           >
               <el-select v-model="formData.extProvince_SDK" style="width: 91%" filterable placeholder="请选择省份" no-match-text="无匹配数据" @change="handleSelect">
@@ -117,7 +116,7 @@
           <el-col :span="7"
                   class="padding-bottom">
             <el-form-item label="市:"
-                          prop="extCityName_SDK"
+                          prop="extCity_SDK"
                           label-width="80px"
                           >
               <el-select v-model="formData.extCity_SDK" style="width: 91%" filterable placeholder="请选择市"  @change="handleSelectCity" >
@@ -133,7 +132,7 @@
           <el-col :span="7"
                   class="padding-bottom">
             <el-form-item label="区:"
-                          prop="extDistrictName_SDK"
+                          prop="extDistrict_SDK"
                           label-width="80px"
                           >
               <el-select v-model="formData.extDistrict_SDK" style="width: 91%" filterable placeholder="请选择区" no-match-text="无匹配数据">
@@ -288,7 +287,7 @@
             </el-form-item>
           </el-col>
           <el-col  :span="12"  class="padding-bottom">
-            <el-form-item label="签约产品组:" prop="ExtProductGroup_SDK" label-width="120px"  >
+            <el-form-item label="签约产品组:" prop="ExtProductGroup_KUT" label-width="120px"  >
               <el-select v-model="formData.ExtProductGroup_KUT" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in bOptions"
@@ -300,7 +299,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="11"  :offset="1" class="padding-bottom">
-            <el-form-item label="签约总代:" prop="extTotalAgent_SDK" label-width="100px" >
+            <el-form-item label="签约总代:" prop="ExtTotalAgent_KUT" label-width="100px" >
              <el-select v-model="formData.ExtTotalAgent_KUT" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in cOptions"
@@ -417,13 +416,12 @@ export default {
       bOptions:[],
       cOptions:[],
       supplierBaseRules: {
-        Name: [{ 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' }],
-        extProvinceName_SDK: [{ required: true, message: '请选择省份', trigger: 'blur' }],
-        extCityName_SDK: [{ required: true, message: '请选择市', trigger: 'blur' }],
-        extDistrictName_SDK: [{ required: true, message: '请选择区', trigger: 'blur' }],  
+        extProvince_SDK: [{ required: true, message: '请选择省份', trigger: 'blur' }],
+        extCity_SDK: [{ required: true, message: '请选择市', trigger: 'blur' }],
+        extDistrict_SDK: [{ required: true, message: '请选择区', trigger: 'blur' }],  
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],  
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],  
         extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' }],  
@@ -438,8 +436,8 @@ export default {
         extBusinessEmail_SDK: [{ required: true, message: '请输入商务负责人邮箱', trigger: 'blur' },
          { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],  
         ExtChannelType_SDK: [{ required: true, message: '请选择签约渠道类型', trigger: 'blur' }],  
-        ExtProductGroup_SDK: [{ required: true, message: '请选择签约产品组', trigger: 'blur' }],  
-        extTotalAgent_SDK: [{ required: true, message: '请选择签约总代', trigger: 'blur' }],  
+        ExtProductGroup_KUT: [{ required: true, message: '请选择签约产品组', trigger: 'blur' }],  
+        ExtTotalAgent_KUT: [{ required: true, message: '请选择签约总代', trigger: 'blur' }],  
       },
       dialogTableVisible: false,
       TotalRecords:0,
@@ -528,20 +526,24 @@ export default {
         //    this.formData.extDistrictName_SDK=el[this.formData.extDistrict_SDK]
         // })
         this.formData.ExtCustomerType_SDK=101
-        // this.loading=true
+        const ExtProductGroup_KUT=this.formData.ExtProductGroup_KUT.toString()
+        const ExtTotalAgent_KUT=this.formData.ExtTotalAgent_KUT.toString()
+        this.formData.ExtProductGroup_KUT=ExtProductGroup_KUT
+        this.formData.ExtTotalAgent_KUT=ExtTotalAgent_KUT
+        this.loading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
-        //  this.loading=false
+         this.loading=false
         if(resp.results.length<40){
            this.$message.success('提交成功！')
             this.handleClickGoBack()
         }else{
+          this.loading=false
           this.$message.error('提交失败！')
         }
-        
-        
       })
           } else {
-            return false;
+            this.loading=false
+            this.$message.warning('请输入必填信息！')
           }
         });