Merge branch 'dev' into 'master'

Dev

See merge request !6

src/components/Lovs/index.vue

@@ -24,6 +24,7 @@
         v-if="!disabled"
         slot="suffix"
         class="el-input__icon el-icon-search"
+        style="color : #a22796"
         @click="createLovTable"
       />
     </el-input>
@@ -319,4 +320,7 @@ export default {
     padding: 16px 20px;
   }
 }
+.el-input__icon {
+  color: #a22796;
+}
 </style>

src/settings.js

 module.exports = {
-  title: 'Vue Element Admin',
+  title: '客户关系管理系统',
 
   /**
    * @type {boolean} true | false

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

@@ -35,17 +35,20 @@ const tableConfig = {
       showInSearch: true,
     },
     ExtCorporateName_SDK: {
-      label: '法定人代表',
+      label: '法定代表人',
       type: 'input'
     },
     ExtSocialUnifiedCreditCode_SDK: {
       label: '统一社会信用代码',
       type: 'input'
     },
-
     CreationOn: {
       label: '注册时间',
-      type: 'input'
+      type: 'input',
+      // layout: 12,
+      // attrs: {
+      //   format: "yyyy-MM-dd"
+      // }    
     },
     // Ext_QuoteOppotunity_KUT: {
     //   type: 'input',

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

@@ -19,7 +19,7 @@ const tableConfig = {
       showInSearch: true,
     },
     ExtCorporateName_SDK: {
-      label: '法定人代表',
+      label: '法定代表人',
       type: 'input'
     },
     ExtSocialUnifiedCreditCode_SDK: {
@@ -29,7 +29,10 @@ const tableConfig = {
 
     CreationOn: {
       label: '注册时间',
-      type: 'input'
+      type: 'input',
+      // attrs: {
+      //   format: "yyyy-MM-dd"
+      // }    
     },
     // Ext_QuoteOppotunity_KUT: {
     //   type: 'input',

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

@@ -53,7 +53,7 @@ const tableConfig = {
       type: 'input'
     },
     ExtCorporateName_SDK: {
-      label: '法定人代表',
+      label: '法定代表人',
       type: 'input'
     },
     ExtSocialUnifiedCreditCode_SDK: {
@@ -63,7 +63,11 @@ const tableConfig = {
 
     CreationOn: {
       label: '注册时间',
-      type: 'input'
+      type: 'input',
+      // layout: 12,
+      // attrs: {
+      //   format: "yyyy-MM-dd"
+      // }    
     },
     // Ext_QuoteOppotunity_KUT: {
     //   type: 'input',

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

@@ -19,7 +19,7 @@ const tableConfig = {
       showInSearch: true,
     },
     ExtCorporateName_SDK: {
-      label: '法定人代表',
+      label: '法定代表人',
       type: 'input'
     },
     ExtSocialUnifiedCreditCode_SDK: {

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

@@ -99,9 +99,9 @@
                   :offset="1"
                   class="padding-bottom">
             <el-form-item label="省份:"
-                          prop="extProvince_SDK"
+                          prop="provinceID"
                           label-width="80px">
-              <el-select v-model="formData.extProvince_SDK"
+              <el-select v-model="formData.provinceID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择省份"
@@ -117,10 +117,10 @@
           <el-col :span="7"
                   class="padding-bottom">
             <el-form-item label="市:"
-                          prop="extCity_SDK"
+                          prop="cityID"
                           label-width="80px"
-                          required>
-              <el-select v-model="formData.extCity_SDK"
+                          >
+              <el-select v-model="formData.cityID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择市"
@@ -135,14 +135,13 @@
           <el-col :span="7"
                   class="padding-bottom">
             <el-form-item label="区:"
-                          prop="extDistrict_SDK"
+                          prop="districID"
                           label-width="80px"
-                          required>
-              <el-select v-model="formData.extDistrict_SDK"
+                          >
+              <el-select v-model="formData.districID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择区"
-                         no-match-text="无匹配数据"
                          @change="handleSelectDis">
                 <el-option v-for="item in disOptions"
                            :key="item.Code"
@@ -352,7 +351,11 @@ export default {
   },
   data() {
     return {
-      formData: {},
+      formData: {
+        provinceID:'',
+      cityID:'',
+      districID:'',
+      },
       inputEnter: false,
       countryArea: '',
       title: '城市代理商注册',
@@ -369,9 +372,9 @@ export default {
         extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
         // extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)',trigger:'blur' }],
         extCorporateName_SDK: [{ required: true, message: '请输入法人', trigger: 'blur' }],
-        extProvince_SDK: [{ required: true, message: '请选择省份' }],
-        extCity_SDK: [{ required: true, message: '请选择市' }],
-        extDistrict_SDK: [{ required: true, message: '请选择区' }],
+        provinceID: [{ required: true, message: '请选择省份', trigger:''  }],
+        cityID: [{ required: true, message: '请选择市', trigger:''  }],
+        districID: [{ required: true, message: '请选择区', trigger:'' }],
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],
         extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' },
@@ -396,7 +399,7 @@ export default {
     }
   },
   watch: {
-
+     
   },
   computed: {
     visitedViews() {
@@ -429,6 +432,8 @@ export default {
       })
     },
     handleSelect(value) {
+      this.formData.cityID=''
+      this.formData.districID=''
       const app = { provinceCode: value }
       this.$request(Country.searchCity, app).then((resp) => {
         this.cityOptions = resp.results
@@ -437,10 +442,12 @@ export default {
       obj = this.countryOptions.find((item) => {//这里的userList就是上面遍历的数据源
         return item.Code === value;//筛选出匹配数据
       });
+    
       this.formData.extProvinceName_SDK = obj.Name//获取的 name
       this.formData.extProvince_SDK = value//获取的 id
     },
     handleSelectCity(value) {
+     this.formData.districID=''
       const app = { cityCode: value }
       this.$request(Country.searchDis, app).then((resp) => {
         this.disOptions = resp.results

src/views/login/index.vue

@@ -348,6 +348,8 @@ export default {
           this.loading = false
           this.updatePassword = false
           this.$router.push({ path: '/', query: this.otherQuery })
+        }).catch(() => {
+          this.loading = false
         })
       } else {
         this.loading = false
@@ -510,10 +512,10 @@ $dark_gray:#889aa4;
   }
 }
 .submit-btn {
-  padding: 0 15px 20px 0px;
+  padding: 0 0px 20px 45px;
   .el-button {
     height: 40px;
-    width: 330px;
+    width: 400px;
   }
 }
 .el-dialog__body {
@@ -524,6 +526,7 @@ $dark_gray:#889aa4;
     display: flex;
     flex-flow: wrap;
     justify-content: center;
+    margin-left: 30px !important;
   }
   ::v-deep .el-form-item {
     margin-bottom: 20px;

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

@@ -100,9 +100,9 @@
                   :offset="1"
                   class="padding-bottom">
             <el-form-item label="省份:"
-                          prop="extProvince_SDK"
+                          prop="provinceID"
                           label-width="80px">
-              <el-select v-model="formData.extProvince_SDK"
+              <el-select v-model="formData.provinceID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择省份"
@@ -118,9 +118,9 @@
           <el-col :span="7"
                   class="padding-bottom">
             <el-form-item label="市:"
-                          prop="extCity_SDK"
+                          prop="cityID"
                           label-width="80px">
-              <el-select v-model="formData.extCity_SDK"
+              <el-select v-model="formData.cityID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择市"
@@ -135,9 +135,9 @@
           <el-col :span="7"
                   class="padding-bottom">
             <el-form-item label="区:"
-                          prop="extDistrict_SDK"
+                          prop="districID"
                           label-width="80px">
-              <el-select v-model="formData.extDistrict_SDK"
+              <el-select v-model="formData.districID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择区"
@@ -452,7 +452,10 @@ export default {
     return {
       formData: {
         extProductGroup_KUT: [],
-        extTotalAgent_KUT: []
+        extTotalAgent_KUT: [],
+         provinceID:'',
+         cityID:'',
+         districID:'',
       },
       inputEnter: false,
       countryArea: '',
@@ -471,9 +474,9 @@ export default {
         extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
         // extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)' }],
         extCorporateName_SDK: [{ required: true, message: '请输入法人', trigger: 'blur' }],
-        extProvince_SDK: [{ required: true, message: '请选择省份' }],
-        extCity_SDK: [{ required: true, message: '请选择市' }],
-        extDistrict_SDK: [{ required: true, message: '请选择区' }],
+        provinceID: [{ required: true, message: '请选择省份' }],
+        cityID: [{ required: true, message: '请选择市' }],
+        districID: [{ required: true, message: '请选择区' }],
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],
         extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' },
@@ -563,6 +566,8 @@ export default {
       })
     },
     handleSelect(value) {
+      this.formData.cityID=''
+      this.formData.districID=''
       const app = { provinceCode: value }
       this.$request(Country.searchCity, app).then((resp) => {
         this.cityOptions = resp.results
@@ -575,6 +580,7 @@ export default {
       this.formData.extProvince_SDK = value//获取的 id
     },
     handleSelectCity(value) {
+      this.formData.districID=''
       const app = { cityCode: value }
       this.$request(Country.searchDis, app).then((resp) => {
         this.disOptions = resp.results