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

src/store/modules/user.js

@@ -38,7 +38,11 @@ const actions = {
         data.roles = ['admin']
         data.avatar = 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif'
         commit('SET_TOKEN', data.ObjectID)
-        localStorage.setItem('USERINFO', JSON.stringify(data))
+        if (data.ExtIsFistTime_SDK) {
+          localStorage.setItem('CEINFO', JSON.stringify(data))
+        } else {
+          localStorage.setItem('USERINFO', JSON.stringify(data))
+        }
         setToken(data.ObjectID)
         resolve()
       }).catch(error => {

src/views/customers/customers-add/index.vue

@@ -239,9 +239,11 @@ export default {
   },
   methods: {
     handleSubmit (data) {
-      data.extCustomerType_SDK = '121'
-      // this.addBtnStart = true  
-      customerCreate(this.paramsToFormData(data)).then(res => {
+      const formData = this.$translateToC4CData(data)
+      formData.extCustomerType_SDK = '121'
+      console.log(formData)
+      // this.addBtnStart = true 
+      customerCreate(this.paramsToFormData(formData)).then(res => {
         this.addBtnStart = true
         this.objectId = res.results
         const objectID = res.results
@@ -277,7 +279,7 @@ export default {
 <style lang="scss" scoped>
   ::v-deep .el-row--flex {
     display: -webkit-box;
-    .el-col-16 {
+    .el-col-14 {
       width: 90%;
     }
   }

src/views/customers/customers-overview/constant.js

@@ -25,7 +25,7 @@ const tableConfig = {
     //     }, scope.row.ID)
     //   }
     // },
-    ExtCustomerID_SDK: {
+    ExtAgentID_SDK: {
       label: '代理商编码',
       type: 'input'
     },

src/views/customers/municipal-agentList/constant.js

@@ -9,7 +9,7 @@ const tableConfig = {
     align: 'center'
   },
   columns: {
-    ExtCustomerID_SDK: {
+    ExtAgentID_SDK: {
       label: '代理商编码',
       type: 'input'
     },

src/views/customers/municipal-agentList/index.vue

@@ -46,8 +46,8 @@ export default {
   },
   methods: {
     //  编辑
-    handleEdit() {
-      console.log("编辑")
+    handleEdit(row) {
+      console.log("编辑", row)
     },
     //  添加
     handleAdd() {

src/views/customers/potential-customers/constant.js

@@ -44,7 +44,7 @@ const tableConfig = {
     // },
   },
   columns: {
-    ExtCustomerID_SDK: {
+    ExtAgentID_SDK: {
       label: '代理商编码',
       type: 'input'
     },

src/views/customers/provincial-agentList/constant.js

@@ -9,7 +9,7 @@ const tableConfig = {
     align: 'center'
   },
   columns: {
-    ExtCustomerID_SDK: {
+    ExtAgentID_SDK: {
       label: '代理商编码',
       type: 'input'
     },

src/views/customers/provincial-agentList/index.vue

@@ -47,8 +47,8 @@ export default {
   },
   methods: {
     //  编辑
-    handleEdit() {
-      console.log("编辑")
+    handleEdit(row) {
+      console.log("编辑", row)
     },
     //  添加
     handleAdd() {

src/views/login/index.vue

@@ -94,6 +94,7 @@
 // import { validUsername } from '@/utils/validate'
 // import LangSelect from '@/components/LangSelect'
 // import SocialSign from './components/SocialSignin'
+import path from 'path';
 
 export default {
   name: 'Login',
@@ -180,10 +181,23 @@ export default {
             extPassword_SDK: this.loginForm.password
           }
           this.$store.dispatch('user/login', params)
-            .then(res => {
-              this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
+            .then(() => {
+              // if (JSON.parse(localStorage.getItem('CEINFO')).ExtIsFistTime_SDK) {
+              //   this.$confirm('首次登入请修改密码', '提示', {
+              //     confirmButtonText: '确定',
+              //     type: 'warning'
+              //   }).then(() => {
+              //     let dataInfo = JSON.parse(localStorage.getItem('CEINFO'))
+              //     localStorage.setItem('USERINFO', JSON.stringify(dataInfo))
+              //     localStorage.setItem('CEINFO', '')
+              //     this.$router.push({ path: '/changePass' , query: this.otherQuery })
+              //   }).catch(() => {
+              //     console.log('登入失败')
+              //   });
+              // } else {
+                this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
+              // }
               this.loading = false
-              console.log(res)
             })
             .catch(() => {
               this.loading = false
@@ -192,6 +206,7 @@ export default {
           console.log('error submit!!')
           return false
         }
+
       })
     },
     getOtherQuery(query) {