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

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

@@ -96,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>
@@ -373,8 +373,11 @@ export default {
       getCustomer({ objectID: this.id }).then((resp) => {
         this.loading=false
         this.formData = resp.results[0]
-        this.formData.ExtLockRsp_SDK=[]
-        this.formData.ExtLockCity_SDK=[]
+        if(this.formData.ExtProcessNode_SDK==2){
+          this.formData.ExtChannelType_SDK=[]
+           this.formData.ExtLockRsp_SDK=[]
+          this.formData.ExtLockCity_SDK=[]
+        }
         lockRsp({ extProvince_SDK: resp.results[0].ExtProvince_SDK }).then((resp) => {
           this.province = resp.results
         })

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>
@@ -307,7 +307,7 @@ export default {
       page: {},
       // 同 vue-ele-form
       rules: {
-        ExtLockCity_SDK: { required: true, message: '请选择覆盖城市范围' },
+        ExtLockCity_SDK: { required: true, message: '请选择覆盖城市范围',trigger:  'change'},
       }
     }
   },
@@ -345,7 +345,9 @@ export default {
       getCustomer({ objectID: this.id }).then((resp) => {
         this.loading=false
         this.formData = resp.results[0]
-        this.formData.ExtLockCity_SDK=[]
+        if(this.formData.ExtProcessNode_SDK==2){
+             this.formData.ExtLockCity_SDK=[]
+        }
         const app = { provinceCode: resp.results[0].ExtProvince_SDK }
         this.$request(Country.searchCity, app).then((resp) => {
           this.province = resp.results

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

@@ -23,7 +23,7 @@
       <div class="div_list">
         <div id="parallelogram"
              :class="{'bgcolor':formData.ExtProcessNode_SDK==2}">
-          <div class="div_txt2">审批_1区域渠道经理</div>
+          <div class="div_txt2">确认_1区域渠道经理</div>
         </div>
         <div class="parallelogram1"></div>
         <div class="triangle_right"></div>
@@ -31,7 +31,7 @@
       <div class="div_list">
         <div id="parallelogram"
              :class="{'bgcolor':formData.ExtProcessNode_SDK==3}">
-          <div class="div_txt2">审批_2渠道销售总监</div>
+          <div class="div_txt2">确认_2渠道销售总监</div>
         </div>
         <div class="parallelogram1"></div>
         <div class="triangle_right"></div>
@@ -39,7 +39,7 @@
       <div class="div_list">
         <div id="parallelogram"
              :class="{'bgcolor':formData.ExtProcessNode_SDK==4}">
-          <div class="div_txt2">审批_3渠道管理部</div>
+          <div class="div_txt2">确认_3渠道管理部</div>
         </div>
         <div class="parallelogram1"></div>
         <div class="triangle_right"></div>
@@ -112,9 +112,6 @@
           <el-table-column prop="Node"
                            label="审批节点">
           </el-table-column>
-          <el-table-column prop="CreateName_SDK"
-                           label="审批人">
-          </el-table-column>
           <el-table-column prop="Result"
                            label="审批结果">
           </el-table-column>
@@ -321,22 +318,26 @@ export default {
   },
   created() {
     this.id = this.$route.query.objectID
-    this.getList()
-    this.getHistoryList()
-    this.getFile()
-    this.getChannelType()
+    if(this.id){
+     this.getList()
+     this.getHistoryList()
+    //  this.getFile()
+     this.getChannelType()
+    }else{
+      this.$message.error('请求链接无效')
+    }
   },
   methods: {
-    getFile() {
-      const page = {
-        currentPage: 1,
-        pageSize: 10,
-        businessObjectID: this.id
-      }
-      getOneModel(page).then(resp => {
-        this.tableData2 = resp.results
-      })
-    },
+    // getFile() {
+    //   const page = {
+    //     currentPage: 1,
+    //     pageSize: 10,
+    //     businessObjectID: this.id
+    //   }
+    //   getOneModel(page).then(resp => {
+    //     this.tableData2 = resp.results
+    //   })
+    // },
     getList() {
       this.loading = true
       getCustomer({ objectID: this.id }).then((resp) => {

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

@@ -473,11 +473,14 @@ export default {
           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);
+            setTimeout(() => {
+              this.$router.back()
+            }, 1000);
+            //              setTimeout(function(){
+            //                console.log('延时两秒')
+            // 　　           window.location.href="about:blank";
+            //                window.close(); 
+            // 　　         },20000);
           }).catch((err) => {
             this.btnloading = false
           })

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

@@ -22,7 +22,7 @@
       <div class="div_list">
         <div id="parallelogram"
              :class="{'bgcolor':formData.ExtProcessNode_SDK==2}">
-          <div class="div_txt2">审批_1区域渠道经理</div>
+          <div class="div_txt2">确认_1区域渠道经理</div>
         </div>
         <div class="parallelogram1"></div>
         <div class="triangle_right"></div>
@@ -30,7 +30,7 @@
       <div class="div_list">
         <div id="parallelogram"
              :class="{'bgcolor':formData.ExtProcessNode_SDK==3}">
-          <div class="div_txt2">审批_2渠道销售部大区负责人</div>
+          <div class="div_txt2">确认_2渠道销售部大区负责人</div>
         </div>
         <div class="parallelogram1"></div>
         <div class="triangle_right"></div>
@@ -38,7 +38,7 @@
       <div class="div_list">
         <div id="parallelogram"
              :class="{'bgcolor':formData.ExtProcessNode_SDK==4}">
-          <div class="div_txt2">审批_3渠道销售总监</div>
+          <div class="div_txt2">确认_3渠道销售总监</div>
         </div>
         <div class="parallelogram1"></div>
         <div class="triangle_right"></div>
@@ -46,7 +46,7 @@
       <div class="div_list">
         <div id="parallelogram"
              :class="{'bgcolor':formData.ExtProcessNode_SDK==5}">
-          <div class="div_txt2">审批_4渠道管理部</div>
+          <div class="div_txt2">确认_4渠道管理部</div>
         </div>
         <div class="parallelogram1"></div>
         <div class="triangle_right"></div>
@@ -189,9 +189,6 @@
           <el-table-column prop="Node"
                            label="审批节点">
           </el-table-column>
-          <el-table-column prop="CreateName_SDK"
-                           label="审批人">
-          </el-table-column>
           <el-table-column prop="Result"
                            label="审批结果">
           </el-table-column>
@@ -453,10 +450,15 @@ export default {
   },
   created() {
     this.id = this.$route.query.objectID
+    if(this.id){
     this.getList()
     this.getCommon()
-    this.getFile()
+    // this.getFile()
     this.getHistoryList()
+    }else{
+       this.$message.error('请求链接无效')
+    }
+    
   },
   methods: {
     getList() {
@@ -490,16 +492,16 @@ export default {
     handleUpload() {
 
     },
-    getFile() {
-      const page = {
-        currentPage: 1,
-        pageSize: 10,
-        businessObjectID: this.id
-      }
-      getOneModel(page).then(resp => {
-        this.tableData2 = resp.results
-      })
-    },
+    // getFile() {
+    //   const page = {
+    //     currentPage: 1,
+    //     pageSize: 10,
+    //     businessObjectID: this.id
+    //   }
+    //   getOneModel(page).then(resp => {
+    //     this.tableData2 = resp.results
+    //   })
+    // },
     btnLink(row) {
       window.open(row.FileURL)
     },

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

@@ -638,8 +638,7 @@ export default {
             this.$message.success('提交成功！')
             setTimeout(function(){
 　　            this.$router.back()
-　　         },20000);
-  
+　　         },1000);
           }).catch((err) => {
             this.btnloading = false
           })