Browse Source

修改地址接口

ymy 1 năm trước cách đây
mục cha
commit
a7599d81ea

+ 1 - 1
src/api/omsOrder.ts

@@ -12,7 +12,7 @@ export function query(params:any,data?:any) {
 //获取地址
 export function getProvince(data:any){
 	return request({
-		url:'/omsOrder/omsArea/getByParentCode',
+		url:'/omsOrder/omsArea/getByPid',
 		method:'Get',
 		params:data
 	})

+ 27 - 31
src/benyun/components/byArea/byArea.vue

@@ -9,8 +9,8 @@
               <el-option
                 v-for="item in optionsProvince"
                 :key="item.id"
-                :label="item.name"
-                :value="item.code">
+                :label="item.extName"
+                :value="item.id">
               </el-option>
             </el-select>
           </div>
@@ -24,8 +24,8 @@
               <el-option
                 v-for="item in optionsCity"
                 :key="item.id"
-                :label="item.name"
-                :value="item.code">
+                :label="item.extName"
+                :value="item.id">
               </el-option>
             </el-select>
           </div>
@@ -39,8 +39,8 @@
               <el-option
                 v-for="item in optionsCounty"
                 :key="item.id"
-                :label="item.name"
-                :value="item.code">
+                :label="item.extName"
+                :value="item.id">
               </el-option>
             </el-select>
           </div>
@@ -54,8 +54,8 @@
               <el-option
                 v-for="item in optionsTown"
                 :key="item.id"
-                :label="item.name"
-                :value="item.code">
+                :label="item.extName"
+                :value="item.id">
               </el-option>
             </el-select>
           </div>
@@ -181,9 +181,8 @@ export default class ByArea extends VueViews {
     this.province = '';
     this.area = '';
     for(const item of this.optionsProvince){
-      if(item.code == v){
-        this.province = item.name;
-        this.area = item.fullName;
+      if(item.id == v){
+        this.province = item.extName;
       }
     }
     this.city='';
@@ -206,9 +205,8 @@ export default class ByArea extends VueViews {
     this.city = '';
     this.area = '';
     for(const item of this.optionsCity){
-      if(item.code == v){
-        this.city = item.name;
-        this.area = item.fullName;
+      if(item.id == v){
+        this.city = item.extName;
       }
     }
     this.county='';
@@ -228,9 +226,8 @@ export default class ByArea extends VueViews {
     this.county = '';
     this.area = '';
     for(const item of this.optionsCounty){
-      if(item.code == v){
-        this.county = item.name;
-        this.area = item.fullName;
+      if(item.id == v){
+        this.county = item.extName;
       }
     }
     this.townCode = '';
@@ -248,9 +245,8 @@ export default class ByArea extends VueViews {
     this.town = '';
     this.area = '';
     for(const item of this.optionsTown){
-      if(item.code == v){
-        this.town = item.name;
-        this.area = item.fullName;
+      if(item.id == v){
+        this.town = item.extName;
       }
     }
     this.areaCode = v;
@@ -282,12 +278,12 @@ export default class ByArea extends VueViews {
     if(this.attrs.townCode){
       obj[this.attrs.townCode]=this.townCode
     }
-    if(this.attrs.areaCode){
-      obj[this.attrs.areaCode]=this.areaCode;
-    }
-    if(this.attrs.area){
-      obj[this.attrs.area]=this.area;
-    }
+    // if(this.attrs.areaCode){
+    //   obj[this.attrs.areaCode]=this.areaCode;
+    // }
+    // if(this.attrs.area){
+    //   obj[this.attrs.area]=this.area;
+    // }
     return obj;
   }
   onChange(){
@@ -297,7 +293,7 @@ export default class ByArea extends VueViews {
   getProvince(){
     this.request({
       params:{
-        parentCode:'86'
+        pid:'0'
       },
       success:(data:any) => {
         this.optionsProvince = data;
@@ -308,7 +304,7 @@ export default class ByArea extends VueViews {
   getCity(v:any){
     this.request({
       params:{
-        parentCode:v
+        pid:v
       },
       success:(data:any) => {
         this.optionsCity = data;
@@ -319,7 +315,7 @@ export default class ByArea extends VueViews {
   getCounty(v:any){
     this.request({
       params:{
-        parentCode:v
+        pid:v
       },
       success:(data:any) => {
         this.optionsCounty = data;
@@ -330,7 +326,7 @@ export default class ByArea extends VueViews {
   getTown(v:any){
     this.request({
       params:{
-        parentCode:v
+        pid:v
       },
       success:(data:any) => {
         this.optionsTown = data;
@@ -339,7 +335,7 @@ export default class ByArea extends VueViews {
   }
   request(data:any){
     let parame:any = {
-      url:'/omsOrder/omsArea/getByParentCode',
+      url:'/omsOrder/omsArea/getByPid',
       method: 'GET',
     };
     parame.params = data.params;

+ 1 - 1
src/benyun/utils/dateFormat.ts

@@ -45,5 +45,5 @@ export default function Format(date:any,fmt:any){
       fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
       return fmt;  
   }
-  }
+}
   

+ 3 - 3
src/views/oms/order/index.vue

@@ -957,13 +957,13 @@ export default class Order extends Vue {
   getProvince(){
     this.provinceOptions = [];
     getProvince({
-      parentCode:'86'
+      pid:'0'
     }).then((res:any) => {
       if(res.data){
         for(const item of res.data){
           this.provinceOptions.push({
-            label:item.name,
-            value:item.code
+            label:item.extName,
+            value:item.id
           })
         }
       }