联调发货接口

src/views/system/order/components/orderDetail.vue

@@ -43,7 +43,7 @@
               <img class="icon" src="@/assets/image/order/icon2.png" alt="">
               <span>买家信息</span>
             </div>
-            <el-button size="mini" type="primary" @click="modifyinfoDialog = true">修改收货信息</el-button>
+            <el-button size="mini" type="primary" @click="modifyinfo">修改收货信息</el-button>
           </div>
           <div>
             <el-row class="row-title">
@@ -83,8 +83,8 @@
             <el-table-column label="快递单号" prop="Tel"/>
             <el-table-column label="操作" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="text" @click="goShipping(1)">去发货</el-button>
-                <el-button size="mini" type="text" @click="dialogCheck = true">查看物流</el-button>
+                <el-button size="mini" type="text" @click="goShipping(3)">去发货</el-button>
+                <el-button size="mini" type="text" @click="getExpressInfoNew">查看物流</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -106,7 +106,7 @@
               <img class="icon" src="@/assets/image/order/icon5.png" alt="">
               <span>订单备注</span>
             </div>
-            <el-button size="mini" type="primary" @click="addRemarkDialog = true">添加备注</el-button>
+            <el-button size="mini" type="primary" @click="addRemark">添加备注</el-button>
           </div>
           <div style="width: 75%; min-height: 100px; border: 1px solid #eee;"></div>
         </div>
@@ -147,7 +147,7 @@
       :append-to-body="true"
       >
       <div style="margin: 0 10%">
-        <el-form ref="form" :model="form" label-width="100px">
+        <el-form ref="form" label-width="100px">
           <el-form-item label="快递公司：">
             <el-select size="mini" v-model="expressNum" placeholder="请选择快递公司" style="width: 100%;">
               <el-option
@@ -159,7 +159,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="快递单号：">
-            <el-input size="mini" v-model="form.name" placeholder="请输入快递单号"></el-input>
+            <el-input size="mini" v-model="express_sn" placeholder="请输入快递单号"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -228,6 +228,7 @@ export default {
   data() {
     return {
       expressNum: '',
+      express_sn: '',
       remark: '',
       modifyinfoDialog: false,
       goShippingDialog: false,
@@ -251,6 +252,17 @@ export default {
       return dateFormat(time, 'Y-m-d H:i:s')
     },
     goShipping(val) {
+      this.expressNum = ''
+      this.express_sn = ''
+
+      if (this.multipleSelection.length == 0 && val != 3) {
+        this.$message({
+          type: 'warning',
+          message: '请选择需要发货的商品'
+        })
+        return
+      }
+
       switch(val) {
         case 1: 
           this.titleInfo = '去发货'
@@ -260,6 +272,10 @@ export default {
           this.titleInfo = '补单发货'
           this.goShippingDialog = true
           break
+        case 3: 
+          this.titleInfo = '去发货'
+          this.goShippingDialog = true
+          break
         default:
           break
       }
@@ -268,25 +284,83 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
+    modifyinfo() {
+      this.form = {
+        name: '',
+        mobile: '',
+        address: ''
+      }
+      this.modifyinfoDialog = true
+    },
     // 修改买家信息
     handleModifyInfo() {
+      if (!this.form.name) {
+        this.$message({
+          type: 'warning',
+          message: '请输入收货人姓名'
+        })
+        return
+      }
+      if (!this.form.mobile) {
+        this.$message({
+          type: 'warning',
+          message: '请输入联系人电话'
+        })
+        return
+      }
+      if (!this.form.address) {
+        this.$message({
+          type: 'warning',
+          message: '请输入收货地址'
+        })
+        return
+      }
       this.modifyinfoDialog = false
     },
     // 去发货
     handleGoShipping() {
+      if (!this.expressNum) {
+        this.$message({
+          type: 'warning',
+          message: '请选择快递公司'
+        })
+        return
+      }
+      if (!this.express_sn) {
+        this.$message({
+          type: 'warning',
+          message: '请输入快递单号'
+        })
+        return
+      }
+
+      let expressName = ''
+      this.expressLists.map((item, index) => {
+        if (item.value == this.expressNum) {
+          expressName = item.label
+        }
+      })
+
       let params = {
-        order_goods_ids: [],
-        express_company_name: '',
-        express_sn: ''
+        order_goods_ids: [10],
+        express_company_name: expressName,
+        express_sn: this.express_sn,
+        express_code: this.expressNum
       }
-      sendOrder().then(res => {
+      sendOrder(params).then(res => {
         if (res.code == 1) {
+          this.$message({
+            type: 'success',
+            message: '商品已发货'
+          })
           this.goShippingDialog = false
         }
       })
     },
     // 查看物流
     getExpressInfoNew() {
+      this.dialogCheck = true
+
       let params = {
         order_sn: '',
         goods_id: '',
@@ -298,8 +372,20 @@ export default {
         }
       })
     },
+    addRemark() {
+      this.remark = ''
+      this.addRemarkDialog = true
+    },
     // 订单备注
     getRemarkOrder() {
+      if (!this.remark) {
+        this.$message({
+          type: 'warning',
+          message: '请输入订单备注'
+        })
+        return
+      }
+
       let params = {
         order_id: '',
         remark: this.remark

src/views/system/order/index.vue

@@ -242,8 +242,8 @@
           page: this.currentPage,
           limit: this.pageSize,
           status: this.goodsStatus,
-          start_time: this.form.dateTime[0] || '',
-          end_time: this.form.dateTime[1] || '',
+          start_time: new Date(this.form.dateTime[0]).getTime() / 1000 || '',
+          end_time: new Date(this.form.dateTime[1]).getTime() / 1000 || '',
           order_sn: this.form.order_sn,
           goods_name: this.form.GoodsName,
           real_name: this.form.shipname,
@@ -344,7 +344,7 @@
       // 订单详情
       handleInfo(row) {
         this.detailDialog = true
-        this.order_detail = row.order_sn
+        this.order_detail = row.parent_order_sn
         orderInfo({order_sn: this.order_detail}).then(res => {
 
         })