修改提交快递信息

src/views/platmanag/order/detail_order.vue

@@ -1,7 +1,13 @@
 <template>
   <div id="form-1">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight">
+      <el-col
+        :span="24"
+        class="main animate__animated animate__backInRight"
+        v-loading="loadings"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+      >
         <el-col class="top-btn">
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
@@ -101,6 +107,7 @@ export default {
       typeList: [],
       statusList: [],
       pay: {},
+      loadings: true,
     };
   },
   async created() {
@@ -121,6 +128,7 @@ export default {
         this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.pay);
       }
+      this.loadings = false;
     },
     toUrl(url) {
       if (url) {

src/views/platmanag/order/detail_orderDetail.vue

@@ -1,7 +1,13 @@
 <template>
   <div id="form-1">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight">
+      <el-col
+        :span="24"
+        class="main animate__animated animate__backInRight"
+        v-loading="loadings"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+      >
         <el-col class="top-btn">
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
@@ -191,10 +197,11 @@ export default {
       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' }],
+        // shop_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],
+        // shop_transport_type: [{ required: true, message: '请选择快递公司', trigger: 'change' }],
+        // transport_type: [{ required: true, message: '请选择快递类型', trigger: 'change' }],
       },
+      loadings: true,
     };
   },
   async created() {
@@ -246,6 +253,7 @@ export default {
           }
         }
       }
+      this.loadings = false;
     },
     async querySearch(value) {
       this.loading = true;
@@ -265,32 +273,51 @@ export default {
     handleSelect(value) {},
     // 提交
     async onSubmit(formName, val) {
-      this.$refs[formName].validate(async (valid) => {
-        if (valid) {
-          this.$confirm('是否确认保存', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          }).then(async () => {
-            let form = this.form;
-            let transport = {};
-            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);
-            if (this.$checkRes(res)) {
-              this.$message({ type: `success`, message: `维护信息成功` });
-              this.search();
-            }
-          });
-        } else {
-          console.log('error submit!!');
-          return false;
-        }
-      });
+      var form = this.form;
+      var transport = {};
+      var res;
+      if (form.shop_transport_no != undefined) transport.shop_transport_no = form.shop_transport_no;
+      if (form.shop_transport_type != undefined) 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.shop_transport_no == undefined || form.shop_transport_type == undefined) {
+        this.$refs[formName].validate(async (valid) => {
+          if (valid) {
+            this.$confirm('快递信息未填写完整，是否保存发货', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            }).then(async () => {
+              if (form.id) res = await this.update(form);
+              if (this.$checkRes(res)) {
+                this.$message({ type: `success`, message: `维护信息成功` });
+                this.search();
+              }
+            });
+          } else {
+            return false;
+          }
+        });
+      } else {
+        this.$refs[formName].validate(async (valid) => {
+          if (valid) {
+            this.$confirm('是否确认保存', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            }).then(async () => {
+              if (form.id) res = await this.update(form);
+              if (this.$checkRes(res)) {
+                this.$message({ type: `success`, message: `维护信息成功` });
+                this.search();
+              }
+            });
+          } else {
+            return false;
+          }
+        });
+      }
     },
 
     // 返回

src/views/platmanag/order/detail_sales_order.vue

@@ -1,7 +1,13 @@
 <template>
   <div id="form-1">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight">
+      <el-col
+        :span="24"
+        class="main animate__animated animate__backInRight"
+        v-loading="loadings"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+      >
         <el-col class="top-btn">
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
@@ -102,6 +108,7 @@ export default {
       typeList: [],
       statusList: [],
       pay: {},
+      loadings: true,
     };
   },
   async created() {
@@ -122,6 +129,7 @@ export default {
         this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.pay);
       }
+      this.loadings = false;
     },
     toUrl(url) {
       if (url) {

src/views/platmanag/order/detail_sales_orderDetail.vue

@@ -1,7 +1,13 @@
 <template>
   <div id="form-1">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight">
+      <el-col
+        :span="24"
+        class="main animate__animated animate__backInRight"
+        v-loading="loadings"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+      >
         <el-col class="top-btn">
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
@@ -205,6 +211,7 @@ export default {
       // 退款金额
       payMoney: {},
       url: '/files/point/afterSale/upload',
+      loadings: true,
     };
   },
   async created() {
@@ -231,6 +238,7 @@ export default {
         this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.order.pay);
       }
+      this.loadings = false;
     },
     toUrl(url) {
       if (url) {

src/views/selfShop/order/detail_order.vue

@@ -1,7 +1,13 @@
 <template>
   <div id="form-1">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight">
+      <el-col
+        :span="24"
+        class="main animate__animated animate__backInRight"
+        v-loading="loadings"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+      >
         <el-col class="top-btn">
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
@@ -101,6 +107,7 @@ export default {
       typeList: [],
       statusList: [],
       pay: {},
+      loadings: true,
     };
   },
   async created() {
@@ -121,6 +128,7 @@ export default {
         this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.pay);
       }
+      this.loadings = false;
     },
     toUrl(url) {
       if (url) {

src/views/selfShop/order/detail_orderDetail.vue

@@ -1,7 +1,13 @@
 <template>
   <div id="form-1">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight">
+      <el-col
+        :span="24"
+        class="main animate__animated animate__backInRight"
+        v-loading="loadings"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+      >
         <el-col class="top-btn">
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
@@ -191,10 +197,11 @@ export default {
       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' }],
+        // shop_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],
+        // shop_transport_type: [{ required: true, message: '请选择快递公司', trigger: 'change' }],
+        // transport_type: [{ required: true, message: '请选择快递类型', trigger: 'change' }],
       },
+      loadings: true,
     };
   },
   async created() {
@@ -246,6 +253,7 @@ export default {
           }
         }
       }
+      this.loadings = false;
     },
     async querySearch(value) {
       this.loading = true;
@@ -265,32 +273,51 @@ export default {
     handleSelect(value) {},
     // 提交
     async onSubmit(formName, val) {
-      this.$refs[formName].validate(async (valid) => {
-        if (valid) {
-          this.$confirm('是否确认保存', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          }).then(async () => {
-            let form = this.form;
-            let transport = {};
-            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);
-            if (this.$checkRes(res)) {
-              this.$message({ type: `success`, message: `维护信息成功` });
-              this.search();
-            }
-          });
-        } else {
-          console.log('error submit!!');
-          return false;
-        }
-      });
+      var form = this.form;
+      var transport = {};
+      var res;
+      if (form.shop_transport_no != undefined) transport.shop_transport_no = form.shop_transport_no;
+      if (form.shop_transport_type != undefined) 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.shop_transport_no == undefined || form.shop_transport_type == undefined) {
+        this.$refs[formName].validate(async (valid) => {
+          if (valid) {
+            this.$confirm('快递信息未填写完整，是否保存发货', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            }).then(async () => {
+              if (form.id) res = await this.update(form);
+              if (this.$checkRes(res)) {
+                this.$message({ type: `success`, message: `维护信息成功` });
+                this.search();
+              }
+            });
+          } else {
+            return false;
+          }
+        });
+      } else {
+        this.$refs[formName].validate(async (valid) => {
+          if (valid) {
+            this.$confirm('是否确认保存', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            }).then(async () => {
+              if (form.id) res = await this.update(form);
+              if (this.$checkRes(res)) {
+                this.$message({ type: `success`, message: `维护信息成功` });
+                this.search();
+              }
+            });
+          } else {
+            return false;
+          }
+        });
+      }
     },
 
     // 返回

src/views/selfShop/order/detail_sales_order.vue

@@ -1,7 +1,13 @@
 <template>
   <div id="form-1">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight">
+      <el-col
+        :span="24"
+        class="main animate__animated animate__backInRight"
+        v-loading="loadings"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+      >
         <el-col class="top-btn">
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
@@ -102,6 +108,7 @@ export default {
       typeList: [],
       statusList: [],
       pay: {},
+      loadings: true,
     };
   },
   async created() {
@@ -122,6 +129,7 @@ export default {
         this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.pay);
       }
+      this.loadings = false;
     },
     toUrl(url) {
       if (url) {

src/views/selfShop/order/detail_sales_orderDetail.vue

@@ -1,7 +1,13 @@
 <template>
   <div id="form-1">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight">
+      <el-col
+        :span="24"
+        class="main animate__animated animate__backInRight"
+        v-loading="loadings"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+      >
         <el-col class="top-btn">
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
@@ -205,6 +211,7 @@ export default {
       // 退款金额
       payMoney: {},
       url: '/files/point/afterSale/upload',
+      loadings: true,
     };
   },
   async created() {
@@ -231,6 +238,7 @@ export default {
         this.$set(this, `total_detail`, res.data.total_detail);
         this.$set(this, `pay`, res.data.order.pay);
       }
+      this.loadings = false;
     },
     toUrl(url) {
       if (url) {