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

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

@@ -3,15 +3,15 @@
     <Title :title="title">
       <span>*</span>为必填项
     </Title>
-    <div class="basic-info">
+    <div class="basic-info"  v-loading='loading'>
       <ele-form-section v-model="formData"
                         :rules="rules"
+                       
                         :sections="sections">
         <template v-slot:ExtLockRsp_SDK="{ formData }">
           <!-- 插槽内容有el-form-item组件包裹 -->
           <el-select v-if="formData.ExtProcessNode_SDK==2"
                      v-model="formData.ExtLockRsp_SDK"
-                     :disabled="!formData.ExtProcessNode_SDK==2"
                      style="width: 91%"
                      multiple
                      filterable
@@ -32,7 +32,6 @@
           <!-- 插槽内容有el-form-item组件包裹 -->
           <el-select v-if="formData.ExtProcessNode_SDK==2"
                      v-model="formData.ExtLockCity_SDK"
-                     :disabled="!formData.ExtProcessNode_SDK==2"
                      style="width: 91%"
                      multiple
                      filterable
@@ -53,9 +52,8 @@
           <!-- 插槽内容有el-form-item组件包裹 -->
           <el-select v-if="formData.ExtProcessNode_SDK==2"
                      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"
@@ -341,21 +339,20 @@ export default {
       cOptions: [],
       // 同 vue-ele-form
       rules: {
-        ExtChannelType_SDK: { required: true, message: '请选择签约渠道类型' },
+        ExtChannelType_SDK: {required: true, message: '请选择签约渠道类型',trigger: 'change'  },
         ExtLockRsp_SDK: { required: true, message: '请选择锁定RSP' },
         ExtLockCity_SDK: { required: true, message: '请选择城市覆盖范围' },
       }
     }
   },
   watch: {
-
+     
   },
   created() {
 
     this.id = this.$route.query.id
     this.getList()
     this.getHistoryList()
-    this.getChannelType()
     this.getFile()
   },
   methods: {
@@ -370,12 +367,12 @@ export default {
       })
     },
     getList() {
+      this.loading=true
       getCustomer({ objectID: this.id }).then((resp) => {
-        resp.results[0].ExtChannelType_SDK = null
+        this.loading=false
+        resp.results[0].ExtChannelType_SDK=null
+        resp.results[0].ExtChannelType_SDKText=null
         this.formData = resp.results[0]
-        if (this.formData.ExtProcessNode_SDK != 2) {
-          this.rules.ExtChannelType_SDK = []
-        }
         lockRsp({ extProvince_SDK: resp.results[0].ExtProvince_SDK }).then((resp) => {
           this.province = resp.results
         })
@@ -383,13 +380,12 @@ export default {
         this.$request(Country.searchCity, app).then((resp) => {
           this.apptions = resp.results
         })
+        typeSearch({ code: 'ExtChannelType_SDK', module: 'Customer', content: 'CCP' }).then((resp) => {
+          this.cOptions = resp
       })
-    },
-    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

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

@@ -3,9 +3,9 @@
     <Title :title="title">
       <span>*</span>为必填项
     </Title>
-    <div class="basic-info">
+    <div class="basic-info" v-loading='loading'>
       <ele-form-section v-model="formData"
-                        :rules="rules"
+                        :rules="rules"                      
                         :sections="sections">
         <template v-slot:ExtLockCity_SDK="{ formData }">
           <!-- 插槽内容有el-form-item组件包裹 -->
@@ -339,7 +339,9 @@ export default {
       window.open(row.FileURL)
     },
     getList() {
+      this.loading=true
       getCustomer({ objectID: this.id }).then((resp) => {
+        this.loading=false
         this.formData = resp.results[0]
         const app = { provinceCode: resp.results[0].ExtProvince_SDK }
         this.$request(Country.searchCity, app).then((resp) => {

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

@@ -51,39 +51,40 @@
         </div>
       </div>
     </div>
-    <div class="basic-info">
+    <div class="basic-info"
+         v-loading='loading'>
       <ele-form-section v-model="formData"
                         :rules="rules"
                         :sections="sections"
                         ref="formData">
         <template v-slot:ExtLeader_SDK="{ formData }">
           <el-input v-model="formData.ExtLeader_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
 
         <template v-slot:ExtLeaderPhone_SDK="{ formData }">
           <el-input v-model="formData.ExtLeaderPhone_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
 
         <template v-slot:ExtLeaderEmail_SDK="{ formData }">
           <el-input v-model="formData.ExtLeaderEmail_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
 
         <template v-slot:ExtUnis_SDK="{ formData }">
           <el-input v-model="formData.ExtUnis_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
 
         <template v-slot:ExtUnisPhone_SDK="{ formData }">
           <el-input v-model="formData.ExtUnisPhone_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
 
         <template v-slot:ExtUnisEmail_SDK="{ formData }">
           <el-input v-model="formData.ExtUnisEmail_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
         <template v-slot:ApproveBtn="{ formData }">
           <el-button style="margin-left: 40%;"
@@ -94,7 +95,10 @@
         </template>
       </ele-form-section>
       <div class="table-contain">
-        <PersonalInFo :addBtnStart='!formData.ExtProcessNode_SDK==1' :isShowEditBtn='formData.ExtProcessNode_SDK==1' :dedeleBtnStart="!formData.ExtProcessNode_SDK==1" :type-code="typeCode"/>
+        <PersonalInFo :addBtnStart='formData.ExtProcessNode_SDK!=1'
+                      :isShowEditBtn='formData.ExtProcessNode_SDK==1'
+                      :dedeleBtnStart="formData.ExtProcessNode_SDK!=1"
+                      :type-code="typeCode" />
       </div>
       <div class="table-contain">
         <div class="form-container">审批意见</div>
@@ -159,7 +163,7 @@ export default {
   data() {
     return {
       form: {},
-       typeCode: uploadCode.customer,
+      typeCode: uploadCode.customer,
       dialogFormVisible: false,
       title: '城市代理商审批进度查询',
       addBtnStart: false,
@@ -334,7 +338,9 @@ export default {
       })
     },
     getList() {
+      this.loading = true
       getCustomer({ objectID: this.id }).then((resp) => {
+        this.loading = false
         this.formData = resp.results[0]
         lockRsp({ extProvince_SDK: resp.results[0].ExtProvince_SDK }).then((resp) => {
           this.province = resp.results

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

@@ -483,7 +483,7 @@ export default {
           })
         } else {
           this.btnloading = false
-          this.$message.warning('请上传附件,输入必填信息！')
+          this.$message.warning('请输入必填信息！')
         }
       });
 

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

@@ -58,51 +58,52 @@
         </div>
       </div>
     </div>
-    <div class="basic-info">
+    <div class="basic-info"
+         v-loading="loading">
       <ele-form-section v-model="formData"
                         :rules="rules"
                         :sections="sections">
 
         <template v-slot:ExtLeader_SDK="{ formData }">
           <el-input v-model="formData.ExtLeader_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
 
         <template v-slot:ExtLeaderPhone_SDK="{ formData }">
           <el-input v-model="formData.ExtLeaderPhone_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
 
         <template v-slot:ExtLeaderEmail_SDK="{ formData }">
           <el-input v-model="formData.ExtLeaderEmail_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
 
         <template v-slot:ExtUnis_SDK="{ formData }">
           <el-input v-model="formData.ExtUnis_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
 
         <template v-slot:ExtUnisPhone_SDK="{ formData }">
           <el-input v-model="formData.ExtUnisPhone_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
 
         <template v-slot:ExtUnisEmail_SDK="{ formData }">
           <el-input v-model="formData.ExtUnisEmail_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
         <template v-slot:ExtBusiness_SDK="{ formData }">
           <el-input v-model="formData.ExtUnisEmail_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
         <template v-slot:ExtBusinessPhone_SDK="{ formData }">
           <el-input v-model="formData.ExtUnisEmail_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
         <template v-slot:ExtBusinessEmail_SDK="{ formData }">
           <el-input v-model="formData.ExtUnisEmail_SDK"
-                    :disabled="!formData.ExtProcessNode_SDK==1"></el-input>
+                    :disabled="formData.ExtProcessNode_SDK!=1"></el-input>
         </template>
         <template v-slot:ApproveBtn="{ formData }">
           <el-button style="margin-left: 40%;"
@@ -171,7 +172,10 @@
         </template>
       </ele-form-section>
       <div class="table-contain">
-         <PersonalInFo :addBtnStart='!formData.ExtProcessNode_SDK==1' :isShowEditBtn='formData.ExtProcessNode_SDK==1' :dedeleBtnStart="!formData.ExtProcessNode_SDK==1" :type-code="typeCode"/>
+        <PersonalInFo :addBtnStart='!formData.ExtProcessNode_SDK==1'
+                      :isShowEditBtn='formData.ExtProcessNode_SDK==1'
+                      :dedeleBtnStart="!formData.ExtProcessNode_SDK==1"
+                      :type-code="typeCode" />
       </div>
       <div class="table-contain">
         <div class="form-container">审批意见</div>
@@ -417,7 +421,7 @@ export default {
       ],
       tableData: [],
       tableData2: [],
-      isShowEditBtn:false,
+      isShowEditBtn: false,
       btnloading: false,
       aOptions: [],
       bOptions: [],
@@ -457,7 +461,9 @@ export default {
   methods: {
     getList() {
       console.log('objectId', this.id)
+      this.loading = true
       getCustomer({ objectID: this.id }).then((resp) => {
+        this.loading = false
         this.formData = resp.results[0]
         const app = { provinceCode: resp.results[0].ExtProvince_SDK }
         this.$request(Country.searchCity, app).then((resp) => {
@@ -556,11 +562,11 @@ export default {
         this.formData.objectID = this.id
         this.btnloading = true
         let arr = this.$translateToC4CData(this.formData)
-        arr.extProductGroup_SDK=arr.extProductGroup_SDK.toString()
-        arr.extProductGroup_KUT=arr.extProductGroup_KUT.toString()
-        arr.extTotalAgent_SDK=arr.extTotalAgent_SDK.toString()
-        arr.extTotalAgent_KUT=arr.extTotalAgent_KUT.toString()
-      
+        arr.extProductGroup_SDK = arr.extProductGroup_SDK.toString()
+        arr.extProductGroup_KUT = arr.extProductGroup_KUT.toString()
+        arr.extTotalAgent_SDK = arr.extTotalAgent_SDK.toString()
+        arr.extTotalAgent_KUT = arr.extTotalAgent_KUT.toString()
+
         this.$request(customer.updataAppUrl, arr).then((resp) => {
           this.btnloading = false
           this.$message.success('提交成功！')

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

@@ -644,7 +644,7 @@ export default {
           })
         } else {
           this.btnloading = false
-          this.$message.warning('请上传附件,输入必填信息！')
+          this.$message.warning('请输入必填信息！')
         }
       });
 

src/views/models/all-models.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <div class="table-container">
       <el-table :data="tableData"
+      v-loading='btnloading'
                   border
                   style="width: 100%">
           <el-table-column prop="FileName"
@@ -24,6 +25,7 @@ export default {
   data () {
     return {
        tableData:[],
+       btnloading:false,
        page:{
           currentPage:1,
           pageSize:10
@@ -36,7 +38,9 @@ export default {
   methods:{
     getList(){
       this.page.typeCode='121'
+      this.btnloading=true
       getModels(this.page).then((resp)=>{
+        this.btnloading=false
          this.tableData=resp.results
       })
     },

src/views/models/city-models.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <div class="table-container">
       <el-table :data="tableData"
+       v-loading='btnloading'
                   border
                   style="width: 100%">
           <el-table-column prop="FileName"
@@ -24,6 +25,7 @@ export default {
   data () {
     return {
        tableData:[],
+       btnloading:false,
        page:{
           currentPage:1,
           pageSize:10
@@ -37,7 +39,9 @@ export default {
     getList(){
       this.page.typeCode='121'
      this.page.fileLabel='3'
+     this.btnloading=true
       getModels(this.page).then((resp)=>{
+        this.btnloading=false
          this.tableData=resp.results
       })
     },

src/views/models/prov-models.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <div class="table-container">
       <el-table :data="tableData"
+       v-loading='btnloading'
                   border
                   style="width: 100%">
           <el-table-column prop="FileName"
@@ -24,6 +25,7 @@ export default {
   data () {
     return {
        tableData:[],
+       btnloading:false,
        page:{
           currentPage:1,
           pageSize:10
@@ -37,7 +39,9 @@ export default {
     getList(){
       this.page.typeCode='121'
      this.page.fileLabel='2'
+      this.btnloading=true
       getModels(this.page).then((resp)=>{
+        this.btnloading=false
          this.tableData=resp.results
       })
     },

src/views/models/total-models.vue

@@ -3,6 +3,7 @@
     <div class="table-container">
       <el-table :data="tableData"
                   border
+                   v-loading='btnloading'
                   style="width: 100%">
           <el-table-column prop="FileName"
                            label="名称">
@@ -24,6 +25,7 @@ export default {
   data () {
     return {
        tableData:[],
+       btnloading:false,
        page:{
           currentPage:1,
           pageSize:10
@@ -37,7 +39,9 @@ export default {
     getList(){
       this.page.typeCode='121'
      this.page.fileLabel='1'
+     this.btnloading=true
       getModels(this.page).then((resp)=>{
+        this.btnloadin=false
          this.tableData=resp.results
       })
     },