update

src/api/index.js

@@ -106,6 +106,7 @@ let requestLoading = (url, method, params, showLoading = true) => {
 // const StanleyLocal = process.env.NODE_ENV == 'production' ? 'http://zngapi.hemadj.com:8080' : '/api';
 // const StanleyLocal = process.env.NODE_ENV == 'production' ? 'http://192.168.1.200:8080' : '/api';
 const StanleyLocal = process.env.NODE_ENV == 'production' ? 'https://apizng.eavic.com' : '/api';
+// const StanleyLocal = process.env.NODE_ENV == 'production' ? 'http://39.97.239.116:8080' : '/api';
 
 const Prefix = StanleyLocal;
 
@@ -214,3 +215,8 @@ export const userDel = (params) => {
 export const editPwd = (params) => {
     return requestLoading(`${Prefix}/EditPwd`, 'post', params)
 }
+
+//手动取出上报
+export const manualSave = (params) => {
+    return requestLoading(`${Prefix}/ManualSave`, 'post', params)
+}

src/pages/subPages/express.vue

@@ -40,6 +40,7 @@
                                             <el-dropdown-menu slot="dropdown">
                                                 <el-dropdown-item icon="el-icon-unlock" style="color:red;" command="openBox">开箱</el-dropdown-item>
                                                 <el-dropdown-item icon="el-icon-phone-outline" style="color:#409EFF;" command="inform" :disabled="v.order_sn == ''">通知</el-dropdown-item>
+                                                <el-dropdown-item icon="el-icon-upload2" style="color:black;" command="reported">手动取出上报</el-dropdown-item>
                                             </el-dropdown-menu>
                                         </el-dropdown>
                                     </div>
@@ -132,6 +133,7 @@ import {
     lockCabinet,
     unLockCabinet,
     releaseAlarm,
+    manualSave
 } from "@/api";
 import moment from "moment";
 export default {
@@ -340,6 +342,34 @@ export default {
                     .catch(() => {
                         console.log("取消");
                     });
+            } else if (command == 'reported') {
+                this.$confirm(`确认取出上报？`, "提示").then(() => {
+                    manualSave({
+                        cabinet_number: cabinet_number,
+                        box_number: box_number,
+                        order_sn: order_sn,
+                    }).then(res => {
+                        if (res && res.msg == "ok") {
+                            this.$message({
+                                message: "操作成功",
+                                type: "success",
+                                center: true,
+                                duration: 1000,
+                            });
+                        } else {
+                            this.$message({
+                                message: "操作失败",
+                                type: "error",
+                                center: true,
+                                duration: 1000,
+                            });
+                        }
+                        console.log(res);
+                    })
+                }).catch(() => {
+                    console.log("取消");
+                })
+
             }
         },
         onHandleCabinet(command) {

src/pages/subPages/order.vue

@@ -2,12 +2,13 @@
 <el-container direction="vertical">
     <el-header height="40px" style="border-bottom: 1px solid #eee">订单管理</el-header>
     <div style="margin:10px 0;">
-        <el-input placeholder="请输入订单号" v-model="searchValue" style="width:200px;margin-left:10px;" />
+        <el-input placeholder="请输入订单号" v-model="searchValue" style="width:200px;margin-left:10px;margin-right:10px;" />
+        <el-date-picker v-model="dataRange" :clearable="false" value-format="yyyy-MM-dd&nbspHH:mm:ss" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         <el-button style="margin-left:10px;" type="primary" @click="onSearch">查询</el-button>
         <el-button style="margin-left:10px;" type="danger" @click="onReset">重置</el-button>
     </div>
 
-    <el-table :data="tableData" border style="width: 100%">
+    <el-table :data="tableData" border style="width: 100%;">
         <el-table-column align="center" prop="id" label="订单id"></el-table-column>
         <el-table-column align="center" prop="order_sn" label="订单编号"></el-table-column>
         <el-table-column align="center" prop="alias" label="柜号"></el-table-column>
@@ -34,7 +35,8 @@ export default {
             pageSize: 10,
             pageNumber: 1,
             total: 0,
-            searchValue: ""
+            searchValue: "",
+            dataRange: []
         };
     },
     mounted() {
@@ -46,15 +48,15 @@ export default {
             orderList({
                 pageSize: _self.pageSize,
                 pageNumber: _self.pageNumber,
-                order_sn: _self.searchValue
-            }).then(
-                (res) => {
-                    if (res && res.msg == "ok") {
-                        _self.total = res.data.total;
-                        _self.tableData = [...res.data.rows];
-                    }
+                order_sn: _self.searchValue,
+                start_time: _self.dataRange && _self.dataRange.length == 2 ? _self.dataRange[0] : '',
+                end_time: _self.dataRange && _self.dataRange.length == 2 ? _self.dataRange[1] : ''
+            }).then((res) => {
+                if (res && res.msg == "ok") {
+                    _self.total = res.data.total;
+                    _self.tableData = [...res.data.rows];
                 }
-            );
+            });
         },
         onPageChange(page) {
             if (page == this.pageNumber) {
@@ -63,7 +65,7 @@ export default {
                 this.pageNumber = page;
                 setTimeout(() => {
                     this.getOrderList();
-                }, 0)
+                }, 0);
             }
         },
         onSearch() {
@@ -73,8 +75,9 @@ export default {
         onReset() {
             this.searchValue = "";
             this.pageNumber = 1;
+            this.dataRange = [];
             this.getOrderList();
-        }
+        },
     },
 };
 </script>

vue.config.js

@@ -1,4 +1,5 @@
 const targetUrl = 'https://apizng.eavic.com';
+// const targetUrl = 'http://39.97.239.116:8080';
 
 module.exports = {
     publicPath:'./',