Merge branch 'feature/Feature-copy' into develop

src/views/supply/engin/home_list.vue

@@ -224,19 +224,19 @@
               </el-form-item>
             </el-col>
 
-            <!--            <el-col :xs="24" :sm="12" :lg="6">-->
-            <!--              <el-form-item label="订单日期" prop="orderTime">-->
-            <!--                <el-date-picker-->
-            <!--                  v-model="screenForm.orderTime"-->
-            <!--                  type="datetimerange"-->
-            <!--                  range-separator="至"-->
-            <!--                  style="width: 100%"-->
-            <!--                  value-format="yyyy-MM-dd HH:mm:ss"-->
-            <!--                  start-placeholder="开始日期"-->
-            <!--                  end-placeholder="结束日期"-->
-            <!--                />-->
-            <!--              </el-form-item>-->
-            <!--            </el-col>-->
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="订单日期" prop="orderTime">
+                <el-date-picker
+                  v-model="screenForm.orderTime"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                />
+              </el-form-item>
+            </el-col>
             <el-col
               :xs="24"
               :sm="!isCustomer ? 12 : 24"