YY пре 2 година
родитељ
комит
6c9973d2f4

+ 2 - 2
src/views/platmanag/order/detail_orderDetail.vue

@@ -213,7 +213,7 @@ export default {
         this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.order.pay);
         if (res.data.transport) {
-          let arr = await this.dictQuery({ code: 'transport_type', value: res.data.transport.shop_transport_type });
+          let arr = await this.dictQuery({ code: 'transport_company', value: res.data.transport.shop_transport_type });
           if (this.$checkRes(arr)) {
             let type = arr.data.find((i) => i.value == res.data.transport.shop_transport_type);
             if (type) {
@@ -238,7 +238,7 @@ export default {
     },
     async querySearch(value) {
       this.loading = true;
-      let res = await this.dictQuery({ code: 'transport_type', label: value });
+      let res = await this.dictQuery({ code: 'transport_company', label: value });
       if (this.$checkRes(res)) {
         this.$set(this, 'shop_transport_typeList', res.data);
       }

+ 3 - 3
src/views/platmanag/sales/detail.vue

@@ -230,7 +230,7 @@ export default {
         if (res.data.transport) {
           // 快递数据回显
           if (res.data.transport.customer_transport_type) {
-            let arr = await this.dictQuery({ code: 'transport_type', value: res.data.transport.customer_transport_type });
+            let arr = await this.dictQuery({ code: 'transport_company', value: res.data.transport.customer_transport_type });
             if (this.$checkRes(arr)) {
               let type = arr.data.find((i) => i.value == res.data.transport.customer_transport_type);
               if (type) {
@@ -243,7 +243,7 @@ export default {
             }
           }
           if (res.data.transport.shop_transport_type) {
-            let aee = await this.dictQuery({ code: 'transport_type', value: res.data.transport.shop_transport_type });
+            let aee = await this.dictQuery({ code: 'transport_company', value: res.data.transport.shop_transport_type });
             if (this.$checkRes(aee)) {
               let type = aee.data.find((i) => i.value == res.data.transport.shop_transport_type);
               if (type) {
@@ -310,7 +310,7 @@ export default {
       });
     },
     async querySearch(value) {
-      let res = await this.dictQuery({ code: 'transport_type', label: value });
+      let res = await this.dictQuery({ code: 'transport_company', label: value });
       if (this.$checkRes(res)) {
         this.$set(this, 'shop_transport_typeList', res.data);
       }

+ 1 - 1
src/views/platmanag/sales/parts/steps-2.vue

@@ -95,7 +95,7 @@ export default {
       reverse: false,
       infoFields: [
         { label: '快递单号', model: 'customer_transport_no' },
-        { label: '快递公司', model: 'customer_transport_type', custom: true },
+        { label: '快递公司', model: 'customer_transport_company', custom: true },
       ],
       rules: {
         customer_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],

+ 2 - 2
src/views/platmanag/sales/parts/steps-3.vue

@@ -117,7 +117,7 @@ export default {
       reverse: false,
       infoFields: [
         { label: '快递单号', model: 'shop_transport_no' },
-        { label: '快递公司', model: 'shop_transport_type', custom: true },
+        { label: '快递公司', model: 'shop_transport_company', custom: true },
       ],
       rules: {
         shop_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],
@@ -125,7 +125,7 @@ export default {
       },
       customerFields: [
         { label: '快递单号', model: 'customer_transport_no' },
-        { label: '快递公司', model: 'customer_transport_type', custom: true },
+        { label: '快递公司', model: 'customer_transport_company', custom: true },
       ],
       customerrules: {
         customer_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],

+ 2 - 2
src/views/selfShop/order/detail_orderDetail.vue

@@ -213,7 +213,7 @@ export default {
         this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.order.pay);
         if (res.data.transport) {
-          let arr = await this.dictQuery({ code: 'transport_type', value: res.data.transport.shop_transport_type });
+          let arr = await this.dictQuery({ code: 'transport_company', value: res.data.transport.shop_transport_type });
           if (this.$checkRes(arr)) {
             let type = arr.data.find((i) => i.value == res.data.transport.shop_transport_type);
             if (type) {
@@ -238,7 +238,7 @@ export default {
     },
     async querySearch(value) {
       this.loading = true;
-      let res = await this.dictQuery({ code: 'transport_type', label: value });
+      let res = await this.dictQuery({ code: 'transport_company', label: value });
       if (this.$checkRes(res)) {
         this.$set(this, 'shop_transport_typeList', res.data);
       }

+ 5 - 6
src/views/selfShop/sales/detail.vue

@@ -230,7 +230,7 @@ export default {
         if (res.data.transport) {
           // 快递数据回显
           if (res.data.transport.customer_transport_type) {
-            let arr = await this.dictQuery({ code: 'transport_type', value: res.data.transport.customer_transport_type });
+            let arr = await this.dictQuery({ code: 'transport_company', value: res.data.transport.customer_transport_type });
             if (this.$checkRes(arr)) {
               let type = arr.data.find((i) => i.value == res.data.transport.customer_transport_type);
               if (type) {
@@ -243,7 +243,7 @@ export default {
             }
           }
           if (res.data.transport.shop_transport_type) {
-            let aee = await this.dictQuery({ code: 'transport_type', value: res.data.transport.shop_transport_type });
+            let aee = await this.dictQuery({ code: 'transport_company', value: res.data.transport.shop_transport_type });
             if (this.$checkRes(aee)) {
               let type = aee.data.find((i) => i.value == res.data.transport.shop_transport_type);
               if (type) {
@@ -310,7 +310,7 @@ export default {
       });
     },
     async querySearch(value) {
-      let res = await this.dictQuery({ code: 'transport_type', label: value });
+      let res = await this.dictQuery({ code: 'transport_company', label: value });
       if (this.$checkRes(res)) {
         this.$set(this, 'shop_transport_typeList', res.data);
       }
@@ -367,14 +367,13 @@ export default {
       window.history.go('-1');
     },
   },
+  
   computed: {
+    ...mapState(['user']),
     id() {
       return this.$route.query.id;
     },
   },
-  computed: {
-    ...mapState(['user']),
-  },
   metaform() {
     return { title: this.$route.meta.title };
   },

+ 1 - 1
src/views/selfShop/sales/parts/steps-2.vue

@@ -95,7 +95,7 @@ export default {
       reverse: false,
       infoFields: [
         { label: '快递单号', model: 'customer_transport_no' },
-        { label: '快递公司', model: 'customer_transport_type', custom: true },
+        { label: '快递公司', model: 'customer_transport_company', custom: true },
       ],
       rules: {
         customer_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],

+ 2 - 2
src/views/selfShop/sales/parts/steps-3.vue

@@ -117,7 +117,7 @@ export default {
       reverse: false,
       infoFields: [
         { label: '快递单号', model: 'shop_transport_no' },
-        { label: '快递公司', model: 'shop_transport_type', custom: true },
+        { label: '快递公司', model: 'shop_transport_company', custom: true },
       ],
       rules: {
         shop_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],
@@ -125,7 +125,7 @@ export default {
       },
       customerFields: [
         { label: '快递单号', model: 'customer_transport_no' },
-        { label: '快递公司', model: 'customer_transport_type', custom: true },
+        { label: '快递公司', model: 'customer_transport_company', custom: true },
       ],
       customerrules: {
         customer_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],

+ 2 - 2
src/views/zr/zrOrder/detail_orderDetail.vue

@@ -178,7 +178,7 @@ export default {
         this.$set(this, `goods`, res.data.goods);
         this.$set(this, `url`, res.data.goods.file[0].url);
         if (res.data.transport) {
-          let arr = await this.dictQuery({ code: 'transport_type', value: res.data.transport.shop_transport_type });
+          let arr = await this.dictQuery({ code: 'transport_company', value: res.data.transport.shop_transport_type });
           if (this.$checkRes(arr)) {
             let type = arr.data.find((i) => i.value == res.data.transport.shop_transport_type);
             if (type) res.data.transport.shop_transport_name = type.label;
@@ -198,7 +198,7 @@ export default {
     },
     async querySearch(value) {
       this.loading = true;
-      let res = await this.dictQuery({ code: 'transport_type', label: value });
+      let res = await this.dictQuery({ code: 'transport_company', label: value });
       if (this.$checkRes(res)) {
         this.$set(this, 'shop_transport_typeList', res.data);
       }