Browse Source

修改bug

Qukatie 2 years ago
parent
commit
c7c61c6cfe
1 changed files with 47 additions and 37 deletions
  1. 47 37
      src/views/businessManagement/salesOrder/configuration/mainList.json

+ 47 - 37
src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -101,7 +101,7 @@
       "label": "订单来源",
       "prop": "a",
       "search": true,
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
@@ -109,7 +109,7 @@
       "label": "毛利额",
       "prop": "grossProfit",
       "search": false,
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
@@ -117,7 +117,7 @@
       "label": "毛利率(%)",
       "prop": "grossProfitRate",
       "search": false,
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     },
@@ -125,7 +125,7 @@
       "label": "销售金额",
       "prop": "orderAmount",
       "search": false,
-      "index": 8,
+      "index": 9,
       "width": 100,
       "overHidden": true
     },
@@ -133,7 +133,7 @@
       "label": "应收金额",
       "prop": "debitAmount",
       "search": false,
-      "index": 9,
+      "index": 10,
       "width": 100,
       "overHidden": true
     },
@@ -141,7 +141,7 @@
       "label": "未收金额",
       "prop": "balanceAmount",
       "search": false,
-      "index": 10,
+      "index": 11,
       "width": 100,
       "overHidden": true
     },
@@ -149,7 +149,7 @@
       "label": "订单数量",
       "prop": "orderQuantity",
       "search": false,
-      "index": 11,
+      "index": 12,
       "width": 100,
       "overHidden": true
     },
@@ -157,7 +157,7 @@
       "label": "已发数量",
       "prop": "actualQuantity",
       "search": false,
-      "index": 12,
+      "index": 13,
       "width": 100,
       "overHidden": true
     },
@@ -165,7 +165,7 @@
       "label": "所属公司",
       "prop": "belongToCorpName",
       "search": false,
-      "index": 13,
+      "index": 14,
       "width": 100,
       "overHidden": true
     },
@@ -173,7 +173,7 @@
       "label": "生产工厂",
       "prop": "productionPlantName",
       "search": false,
-      "index": 13,
+      "index": 15,
       "width": 100,
       "overHidden": true
     },
@@ -181,7 +181,7 @@
       "label": "发货地址",
       "prop": "shippingAddress",
       "search": true,
-      "index": 14,
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
@@ -189,7 +189,7 @@
       "label": "到货地址",
       "prop": "arrivalAddress",
       "search": true,
-      "index": 15,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
@@ -203,7 +203,7 @@
       "label": "付款方式",
       "prop": "paymentType",
       "search": false,
-      "index": 16,
+      "index": 18,
       "width": 100,
       "overHidden": true
     },
@@ -214,7 +214,7 @@
       "searchRange": true,
       "prop": "actualDeliveryDate",
       "search": true,
-      "index": 17,
+      "index": 19,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -228,7 +228,7 @@
       "searchRange": true,
       "prop": "requiredDeliveryDate",
       "search": true,
-      "index": 18,
+      "index": 20,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -242,7 +242,7 @@
       "searchRange": true,
       "prop": "requiredArrivalDate",
       "search": true,
-      "index": 19,
+      "index": 21,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -250,6 +250,16 @@
       "pickerOptions": {}
     },
     {
+      "label": "确认收货时间",
+      "type": "date",
+      "prop": "receiptTime",
+      "index": 22,
+      "width": 100,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "overHidden": true
+    },
+    {
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=order_status",
       "props": {
@@ -259,7 +269,7 @@
       "label": "单据状态",
       "prop": "orderStatus",
       "search": true,
-      "index": 20,
+      "index": 23,
       "width": 100,
       "overHidden": true
     },
@@ -267,7 +277,7 @@
       "label": "公司户头",
       "prop": "banksAccountName",
       "search": false,
-      "index": 21,
+      "index": 24,
       "width": 100,
       "overHidden": true
     },
@@ -275,7 +285,7 @@
       "label": "系统编号",
       "prop": "sysNo",
       "search": true,
-      "index": 22,
+      "index": 25,
       "width": 100,
       "overHidden": true
     },
@@ -283,7 +293,7 @@
       "label": "主订单号",
       "prop": "morderNo",
       "search": false,
-      "index": 23,
+      "index": 26,
       "width": 100,
       "overHidden": true
     },
@@ -297,7 +307,7 @@
       "label": "制单人",
       "prop": "createUser",
       "search": true,
-      "index": 24,
+      "index": 27,
       "width": 100,
       "overHidden": true
     },
@@ -308,7 +318,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "search": true,
-      "index": 25,
+      "index": 28,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -333,7 +343,7 @@
       "label": "收款状态",
       "prop": "gathering",
       "search": true,
-      "index": 26,
+      "index": 29,
       "width": 100,
       "showColumn": false,
       "hide": true,
@@ -343,7 +353,7 @@
       "label": "更改人",
       "prop": "updateUserName",
       "search": false,
-      "index": 27,
+      "index": 30,
       "width": 100,
       "overHidden": true
     },
@@ -351,7 +361,7 @@
       "label": "更改时间",
       "prop": "updateTime",
       "search": false,
-      "index": 28,
+      "index": 31,
       "width": 100,
       "overHidden": true
     },
@@ -359,7 +369,7 @@
       "label": "是否生成采购",
       "prop": "createPurchase",
       "search": false,
-      "index": 29,
+      "index": 32,
       "width": 100,
       "overHidden": true
     },
@@ -367,7 +377,7 @@
       "label": "生成采购时间",
       "prop": "createPurchaseTime",
       "search": false,
-      "index": 30,
+      "index": 33,
       "width": 100,
       "overHidden": true
     },
@@ -375,7 +385,7 @@
       "label": "采购人",
       "prop": "createPurchaseUser",
       "search": false,
-      "index": 31,
+      "index": 34,
       "width": 100,
       "overHidden": true
     },
@@ -383,7 +393,7 @@
       "label": "是否生成收货",
       "prop": "createFreight",
       "search": false,
-      "index": 32,
+      "index": 35,
       "width": 100,
       "overHidden": true
     },
@@ -391,7 +401,7 @@
       "label": "生成收货时间",
       "prop": "createFreightTime",
       "search": false,
-      "index": 33,
+      "index": 36,
       "width": 100,
       "overHidden": true
     },
@@ -399,7 +409,7 @@
       "label": "收货人",
       "prop": "createFreightUser",
       "search": false,
-      "index": 34,
+      "index": 37,
       "width": 100,
       "overHidden": true
     },
@@ -407,7 +417,7 @@
       "label": "请核状态",
       "prop": "status",
       "search": false,
-      "index": 35,
+      "index": 38,
       "width": 100,
       "overHidden": true
     },
@@ -415,7 +425,7 @@
       "label": "是否特批",
       "prop": "specialCheck",
       "search": false,
-      "index": 36,
+      "index": 39,
       "width": 100,
       "overHidden": true
     },
@@ -423,7 +433,7 @@
       "label": "特批状态",
       "prop": "specialCheckStatus",
       "search": false,
-      "index": 37,
+      "index": 40,
       "width": 100,
       "overHidden": true
     },
@@ -431,7 +441,7 @@
       "label": "特批提交人",
       "prop": "specialCheckUser",
       "search": false,
-      "index": 38,
+      "index": 41,
       "width": 100,
       "overHidden": true
     },
@@ -439,7 +449,7 @@
       "label": "特批提交时间",
       "prop": "specialCheckTime",
       "search": false,
-      "index": 39,
+      "index": 42,
       "width": 120,
       "overHidden": true
     },
@@ -447,7 +457,7 @@
       "label": "备注",
       "prop": "orderRemark",
       "search": false,
-      "index": 40,
+      "index": 43,
       "width": 120,
       "overHidden": true
     }