update

app/controller/order/.order.js

@@ -5,6 +5,9 @@ module.exports = {
       "!owner",
       "principal",
       "!client",
+      "treaty",
+      "item",
+      "route",
       "rq_send_time",
       "send_time",
       "rq_arrive_time",
@@ -32,6 +35,9 @@ module.exports = {
       "!owner",
       "principal",
       "!client",
+      "treaty",
+      "item",
+      "route",
       "rq_send_time",
       "send_time",
       "rq_arrive_time",
@@ -59,8 +65,11 @@ module.exports = {
       query: {
         order_no: "%order_no%",
         owner: "owner",
-        principal:"principal",
+        principal: "principal",
         client: "client",
+        treaty:"treaty",
+        item:"item",
+        route:"route",
         "rq_send_time@start": "rq_send_time@start",
         "rq_send_time@end": "rq_send_time@end",
         "rq_arrive_time@start": "rq_arrive_time@start",

app/model/client.js

@@ -62,6 +62,7 @@ const Client = {
     },
   }, // 状态:0=>使用;1禁用
 };
+const zh = '客户';
 
 const schema = new Schema(Client, { toJSON: { virtuals: true } });
 schema.index({ id: 1 });

app/service/order/order.js

@@ -232,14 +232,11 @@ class OrderService extends CrudService {
     // 检查是否全到达了
     const all_arrive = splitList.every(e => e.status === '-1');
     if (all_arrive) return '所有货物全部到达';
-    // 检查是否有未发货
-    const has_not_send = splitList.some(e => e.status === '0');
     // 检查是否有发货的
     const is_send = splitList.some(e => e.status === '1');
     // 检查是否有到达的
     const is_arrive = splitList.some(e => e.status === '-1');
     const word = [];
-    if (has_not_send) word.push('有未发出的货物');
     if (is_send)word.push('部分货物已发出');
     if (is_arrive)word.push('部分货物已到达');
     if (word.length > 0) return word.join(';');