Merge branch 'feature/zmj' of http://git.nyinhong.com/zhengyunfei/xinrenli-admin into feature_lyj

src/views/dynamic/index.vue

@@ -8,9 +8,10 @@
         <el-input v-model="queryParams.tableName" placeholder="请输入联系电话" clearable />
         <el-input v-model="queryParams.tableName" placeholder="请输入联系电话" clearable />
       </el-form-item>
       </el-form-item>
       <el-form-item label="维修时间" prop="tableComment">
       <el-form-item label="维修时间" prop="tableComment">
-        <el-input v-model="queryParams.tableComment" placeholder="请选择维修时间" clearable />
+        <el-date-picker v-model="value1" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+        </el-date-picker>
       </el-form-item>
       </el-form-item>
-      <el-form-item label="维修时间" prop="tableComment">
+      <el-form-item label="订单状态" prop="tableComment">
         <el-select v-model="value" placeholder="请选择">
         <el-select v-model="value" placeholder="请选择">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
           </el-option>

src/views/orderform/index.vue

@@ -8,9 +8,10 @@
         <el-input v-model="queryParams.tableName" placeholder="请输入联系电话" clearable />
         <el-input v-model="queryParams.tableName" placeholder="请输入联系电话" clearable />
       </el-form-item>
       </el-form-item>
       <el-form-item label="维修时间" prop="tableComment">
       <el-form-item label="维修时间" prop="tableComment">
-        <el-input v-model="queryParams.tableComment" placeholder="请选择维修时间" clearable />
+        <el-date-picker v-model="value1" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+        </el-date-picker>
       </el-form-item>
       </el-form-item>
-      <el-form-item label="维修时间" prop="tableComment">
+      <el-form-item label="订单状态" prop="tableComment">
         <el-select v-model="value" placeholder="请选择">
         <el-select v-model="value" placeholder="请选择">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
           </el-option>
@@ -90,6 +91,7 @@ export default {
   name: "orderform",
   name: "orderform",
   data() {
   data() {
     return {
     return {
+      value1:'',
       dialogVisible: false,
       dialogVisible: false,
       dialogVi: false,
       dialogVi: false,
       control: '0',
       control: '0',
@@ -183,7 +185,7 @@ export default {
 
 
     },
     },
     // 页码切换
     // 页码切换
-    getList(){
+    getList() {
 
 
     },
     },
     // 打开查看详情
     // 打开查看详情