1

src/components/common/Home copy.vue

@@ -1,51 +0,0 @@
-<template>
-  <div class="wrapper">
-    <v-head></v-head>
-    <v-sidebar></v-sidebar>
-    <div class="content-box" :class="{ 'content-collapse': collapse }">
-      <v-tags></v-tags>
-      <div class="content">
-        <transition name="move" mode="out-in">
-          <keep-alive :include="tagsList">
-            <router-view></router-view>
-          </keep-alive>
-        </transition>
-        <el-backtop target=".content"></el-backtop>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import vHead from './Header.vue';
-import vSidebar from './Sidebar.vue';
-import vTags from './Tags.vue';
-import bus from './bus';
-export default {
-  data() {
-    return {
-      tagsList: [],
-      collapse: false,
-    };
-  },
-  components: {
-    vHead,
-    vSidebar,
-    vTags,
-  },
-  created() {
-    bus.$on('collapse-content', msg => {
-      this.collapse = msg;
-    });
-
-    // 只有在标签页列表里的页面才使用keep-alive，即关闭标签之后就不保存到内存中了。
-    bus.$on('tags', msg => {
-      let arr = [];
-      for (let i = 0, len = msg.length; i < len; i++) {
-        msg[i].name && arr.push(msg[i].name);
-      }
-      this.tagsList = arr;
-    });
-  },
-};
-</script>

src/components/common/Home.vue

@@ -12,9 +12,10 @@
           <v-tags></v-tags>
           <div class="content">
             <transition name="move" mode="out-in">
-              <keep-alive :include="tagsList">
+              <!-- <keep-alive :include="tagsList">
                 <router-view></router-view>
-              </keep-alive>
+              </keep-alive> -->
+              <router-view></router-view>
             </transition>
             <el-backtop target=".content"></el-backtop>
           </div>

src/views/company/index.vue

@@ -7,37 +7,52 @@
           <el-col :span="24" class="top">
             <el-button type="primary" size="mini" @click="back()">返回</el-button>
           </el-col>
-          <el-form ref="form" :model="form" label-width="120px" :inline="true">
-            <el-form-item label="顾客姓名">
-              <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="车牌号">
-              <el-input v-model="form.license"></el-input>
-            </el-form-item>
-            <el-form-item label="车型">
-              <el-input v-model="form.model"></el-input>
-            </el-form-item>
-            <el-form-item label="车辆颜色">
-              <el-input v-model="form.carcolor"></el-input>
-            </el-form-item>
-            <el-form-item label="顾客电话">
-              <el-input v-model="form.mobile"></el-input>
-            </el-form-item>
-            <el-form-item label="行驶里程">
-              <el-input v-model="form.mileage"></el-input>
-            </el-form-item>
-            <el-form-item label="VIN号">
-              <el-input v-model="form.vin"></el-input>
-            </el-form-item>
-            <el-form-item label="保险日期">
-              <el-date-picker type="date" placeholder="选择日期" v-model="form.insurance" style="width: 100%;"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="驾驶证日期">
-              <el-date-picker type="date" placeholder="选择日期" v-model="form.drive" style="width: 100%;"></el-date-picker>
-            </el-form-item>
-            <el-form-item label="行驶证日期">
-              <el-date-picker type="date" placeholder="选择日期" v-model="form.travel" style="width: 100%;"></el-date-picker>
-            </el-form-item>
+          <el-form ref="form" :model="form" label-width="120px">
+            <el-col :span="6">
+              <el-form-item label="顾客姓名">
+                <el-input v-model="form.name"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="车型">
+                <el-input v-model="form.model"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="车辆颜色">
+                <el-input v-model="form.carcolor"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="顾客电话">
+                <el-input v-model="form.mobile"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="行驶里程">
+                <el-input v-model="form.mileage"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="VIN号">
+                <el-input v-model="form.vin"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="保险日期">
+                <el-date-picker type="date" placeholder="选择日期" v-model="form.insurance" style="width: 100%;"></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="驾驶证日期">
+                <el-date-picker type="date" placeholder="选择日期" v-model="form.drive" style="width: 100%;"></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="行驶证日期">
+                <el-date-picker type="date" placeholder="选择日期" v-model="form.travel" style="width: 100%;"></el-date-picker>
+              </el-form-item>
+            </el-col>
             <!-- <el-form-item class="btn">
               <el-button type="primary" size="medium">保存</el-button>
             </el-form-item> -->
@@ -50,34 +65,44 @@
               <el-divider></el-divider>
             </el-col>
             <el-table :data="formData.tableData" border stripe style="width: 100%;">
-              <el-table-column prop="project" label="维修项目" class="tab1">
+              <el-table-column prop="name" label="维修项目名" class="tab1">
                 <template slot-scope="scope">
-                  <!-- <el-form-item v-if="scope.row.edit" :prop="'tableData.' + scope.$index + '.project'" :rules="rules.project"> -->
-                  <el-form-item v-if="scope.row.edit" :prop="'tableData.' + scope.$index + '.project'">
-                    <el-input v-model="scope.row.project" placeholder="维修项目"></el-input>
+                  <el-form-item v-if="scope.row.edit" :prop="'tableData.' + scope.$index + '.name'">
+                    <el-input v-model="scope.row.name" placeholder="维修项目名"></el-input>
                   </el-form-item>
                   <span v-else>{{ scope.row.name }}</span>
                 </template>
               </el-table-column>
+              <el-table-column prop="type" label="类型">
+                <template slot-scope="scope">
+                  <el-form-item v-if="scope.row.edit" :prop="'tableData.' + scope.$index + '.type'">
+                    <el-input v-model="scope.row.type" placeholder="类型"></el-input>
+                  </el-form-item>
+                  <span v-else>{{ scope.row.type }}</span>
+                </template>
+              </el-table-column>
               <el-table-column prop="parts" label="配件">
                 <template slot-scope="scope">
                   <el-form-item v-if="scope.row.edit" :prop="'tableData.' + scope.$index + '.parts'">
                     <el-input v-model="scope.row.parts" placeholder="配件"></el-input>
                   </el-form-item>
+                  <span v-else>{{ scope.row.parts }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="hours" label="工时">
+              <el-table-column prop="jobdate" label="工时">
                 <template slot-scope="scope">
-                  <el-form-item v-if="scope.row.edit" :prop="'tableData.' + scope.$index + '.hours'">
-                    <el-input v-model="scope.row.hours" placeholder="工时"></el-input>
+                  <el-form-item v-if="scope.row.edit" :prop="'tableData.' + scope.$index + '.jobdate'">
+                    <el-input v-model="scope.row.jobdate" placeholder="工时"></el-input>
                   </el-form-item>
+                  <span v-else>{{ scope.row.jobdate }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="sum" label="合计">
+              <el-table-column prop="totalmoney" label="合计">
                 <template slot-scope="scope">
-                  <el-form-item v-if="scope.row.edit" :prop="'tableData.' + scope.$index + '.sum'">
-                    <el-input v-model="scope.row.sum" placeholder="合计"></el-input>
+                  <el-form-item v-if="scope.row.edit" :prop="'tableData.' + scope.$index + '.totalmoney'">
+                    <el-input v-model="scope.row.totalmoney" placeholder="合计"></el-input>
                   </el-form-item>
+                  <span v-else>{{ scope.row.totalmoney }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="操作">
@@ -87,6 +112,13 @@
               </el-table-column>
             </el-table>
           </el-form>
+          <!-- <el-col :span="24" class="btn">
+            <el-button type="primary" size="medium" @click="addData">添加</el-button>
+            <el-button type="primary" size="medium">保存</el-button>
+          </el-col>
+          <dataTable :fields="newfields" :data="newdata" :opera="newopera" :total="total" @delete="coltoDelete">
+            <dataForm></dataForm>
+          </dataTable> -->
         </el-col>
       </el-col>
     </el-row>
@@ -96,6 +128,8 @@
 <script>
 import breadcrumb from '@c/common/breadcrumb.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
+import dataForm from '@/components/frame/form.vue';
+import dataTable from '@/components/frame/filter-page-table.vue';
 const { mapActions: car } = createNamespacedHelpers('car');
 const { mapActions: repair } = createNamespacedHelpers('repair');
 export default {
@@ -106,6 +140,8 @@ export default {
   props: {},
   components: {
     breadcrumb,
+    // dataForm,
+    // dataTable,
   },
   data: function() {
     return {
@@ -113,9 +149,21 @@ export default {
       formData: {
         tableData: [],
       },
+      // newdata: [],
+      // total: 0,
+      // newfields: [
+      //   { label: '维修项目名', prop: 'name' },
+      //   { label: '类型', prop: 'type' },
+      //   { label: '配件', prop: 'parts' },
+      //   { label: '工时', prop: ' jobdate' },
+      //   { label: '合计', prop: ' totalmoney' },
+      // ],
+      // newopera: [{ label: '删除', method: 'delete' }],
     };
   },
-  created() {},
+  created() {
+    this.search();
+  },
   methods: {
     ...car({ newquery: 'query', newfetch: 'fetch', newdelete: 'delete', newcreate: 'create', newupdate: 'update' }),
     ...repair(['query', 'create', 'delete', 'update', 'fetch']),
@@ -127,6 +175,7 @@ export default {
         if (this.$checkRes(res)) {
           this.$set(this, `form`, res.data);
           this.$set(this.formData, `tableData`, arr.data);
+          // console.log(this.formData.tableData);
         } else {
           this.$message({
             message: res.errmsg,
@@ -167,15 +216,15 @@ export default {
       return this.$route.query.id;
     },
   },
-  watch: {
-    id: {
-      deep: true,
-      immediate: true,
-      handler(val) {
-        this.search();
-      },
-    },
-  },
+  // watch: {
+  //   id: {
+  //     deep: true,
+  //     immediate: true,
+  //     handler(val) {
+  //       this.search();
+  //     },
+  //   },
+  // },
 };
 </script>