添加快递类型

src/views/platmanag/order/detail_orderDetail.vue

@@ -116,6 +116,11 @@
                   <el-option v-for="item in shop_transport_typeList" :key="item.id" :label="item.label" :value="item.value"> </el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="快递类型" prop="transport_type">
+                <el-select v-model="form.transport_type" clearable filterable placeholder="请选择快递类型" size="small" style="width: 100%">
+                  <el-option v-for="i in transport_typeList" :key="i.label" :label="i.label" :value="i.value"> </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item>
                 <el-col>
                   <el-button type="primary" @click="onSubmit('form', '2')" v-if="form.status == '1'"> 发货 </el-button>
@@ -182,10 +187,13 @@ export default {
       order_processList: [],
       // 快递公司
       shop_transport_typeList: [],
+      // 快递类型
+      transport_typeList: [],
       loading: false,
       rules: {
         shop_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],
         shop_transport_type: [{ required: true, message: '请选择快递公司', trigger: 'change' }],
+        transport_type: [{ required: true, message: '请选择快递类型', trigger: 'change' }],
       },
     };
   },
@@ -204,6 +212,7 @@ export default {
       res = await this.fetch(this.id);
       if (this.$checkRes(res)) {
         this.$set(this, `form`, res.data);
+        if (res.data.transport == undefined) this.$set(this.form, `transport_type`, '0');
         // 地址
         this.$set(this, `address`, res.data.address);
         this.$set(this, `shop`, res.data.shop);
@@ -222,6 +231,8 @@ export default {
             }
             this.$set(this, `transport`, res.data.transport);
             this.$set(this.form, `shop_transport_type`, this.transport.shop_transport_type);
+            if (this.transport.transport_type == undefined) this.$set(this.form, `transport_type`, '0');
+            else this.$set(this.form, `transport_type`, this.transport.transport_type);
             this.$set(this.form, `shop_transport_no`, this.transport.shop_transport_no);
           }
           res = await this.sotFetch(this.id);
@@ -266,6 +277,7 @@ export default {
             let res;
             if (form.shop_transport_no) transport.shop_transport_no = form.shop_transport_no;
             if (form.shop_transport_type) transport.shop_transport_type = form.shop_transport_type;
+            if (form.transport_type) transport.transport_type = form.transport_type;
             form.transport = transport;
             if (val != undefined || val != '') form.status = val;
             if (form.id) res = await this.update(form);
@@ -293,6 +305,11 @@ export default {
       if (this.$checkRes(res)) {
         this.$set(this, `order_processList`, res.data);
       }
+      // 减免方式
+      res = await this.dictQuery({ code: 'transport_type' });
+      if (this.$checkRes(res)) {
+        this.$set(this, `transport_typeList`, res.data);
+      }
     },
   },
   computed: {

src/views/selfShop/order/detail_orderDetail.vue

@@ -116,6 +116,11 @@
                   <el-option v-for="item in shop_transport_typeList" :key="item.id" :label="item.label" :value="item.value"> </el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="快递类型" prop="transport_type">
+                <el-select v-model="form.transport_type" clearable filterable placeholder="请选择快递类型" size="small" style="width: 100%">
+                  <el-option v-for="i in transport_typeList" :key="i.label" :label="i.label" :value="i.value"> </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item>
                 <el-col>
                   <el-button type="primary" @click="onSubmit('form', '2')" v-if="form.status == '1'"> 发货 </el-button>
@@ -182,10 +187,13 @@ export default {
       order_processList: [],
       // 快递公司
       shop_transport_typeList: [],
+      // 快递类型
+      transport_typeList: [],
       loading: false,
       rules: {
         shop_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],
         shop_transport_type: [{ required: true, message: '请选择快递公司', trigger: 'change' }],
+        transport_type: [{ required: true, message: '请选择快递类型', trigger: 'change' }],
       },
     };
   },
@@ -204,6 +212,7 @@ export default {
       res = await this.fetch(this.id);
       if (this.$checkRes(res)) {
         this.$set(this, `form`, res.data);
+        if (res.data.transport == undefined) this.$set(this.form, `transport_type`, '0');
         // 地址
         this.$set(this, `address`, res.data.address);
         this.$set(this, `shop`, res.data.shop);
@@ -222,6 +231,8 @@ export default {
             }
             this.$set(this, `transport`, res.data.transport);
             this.$set(this.form, `shop_transport_type`, this.transport.shop_transport_type);
+            if (this.transport.transport_type == undefined) this.$set(this.form, `transport_type`, '0');
+            else this.$set(this.form, `transport_type`, this.transport.transport_type);
             this.$set(this.form, `shop_transport_no`, this.transport.shop_transport_no);
           }
           res = await this.sotFetch(this.id);
@@ -266,6 +277,7 @@ export default {
             let res;
             if (form.shop_transport_no) transport.shop_transport_no = form.shop_transport_no;
             if (form.shop_transport_type) transport.shop_transport_type = form.shop_transport_type;
+            if (form.transport_type) transport.transport_type = form.transport_type;
             form.transport = transport;
             if (val != undefined || val != '') form.status = val;
             if (form.id) res = await this.update(form);
@@ -293,6 +305,11 @@ export default {
       if (this.$checkRes(res)) {
         this.$set(this, `order_processList`, res.data);
       }
+      // 减免方式
+      res = await this.dictQuery({ code: 'transport_type' });
+      if (this.$checkRes(res)) {
+        this.$set(this, `transport_typeList`, res.data);
+      }
     },
   },
   computed: {