Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
| | |
| | | deliveryIdType:'day', |
| | | columnName:'å¾å·', |
| | | selectOrderReviewShow:true, //订åé¦é¡µå å·¥åå®¡æ ¸æé®æ¯å¦æ¾ç¤º |
| | | productName:"product_name", |
| | | productName:"product_name",//产åå建æ¥éåæ®µ |
| | | decValue:3,//订åä¿ç使°ï¼å¤©æ´¥3ä½,常å·2ä½ |
| | | label:1,//æ ç¾ç±»å |
| | | calculateType:1,//订åè®¡ç®æ¹å¼ |
| | |
| | | |
| | | //è·åä¸å¤©åå°å½åæ¶é´ |
| | | function getNowTime() { |
| | | const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15) |
| | | const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 14) |
| | | .toISOString() |
| | | .replace('T', ' ') |
| | | .slice(0, 10) //é»è®¤å¼å§æ¶é´7天å |