Merge branch 'master' of http://git.cc-lotus.info/tyre/lt-system

src/components/common/Header.vue

@@ -5,7 +5,7 @@
       <i v-if="!collapse" class="el-icon-s-fold"></i>
       <i v-else class="el-icon-s-unfold"></i>
     </div>
-    <div class="logo">后台管理系统</div>
+    <div class="logo">车辆维修平台</div>
     <div class="header-right">
       <div class="header-user-con">
         <!-- 全屏显示 -->

src/views/company/index.vue

@@ -33,6 +33,11 @@
                 <el-input v-model="form.vin"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="车牌号">
+                <el-input v-model="form.license" disabled></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>
@@ -48,79 +53,65 @@
                 <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> -->
-            <!-- <el-divider></el-divider> -->
           </el-form>
           <el-form :model="formData" ref="formData">
             <el-col :span="24" class="btn">
               <el-button type="primary" size="medium" @click="addData">添加</el-button>
-              <!-- <el-button type="primary" size="medium" @click="save()">保存</el-button> -->
               <el-divider></el-divider>
             </el-col>
             <el-table :data="formData.tableData" border stripe style="width: 100%;">
               <el-table-column prop="name" label="维修项目名" class="tab1">
                 <template slot-scope="scope">
-                  <!-- <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> -->
                   <el-input v-model="scope.row.name" placeholder="维修项目名"></el-input>
                 </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> -->
                   <el-input v-model="scope.row.type" placeholder="类型"></el-input>
                 </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> -->
                   <el-input v-model="scope.row.parts" placeholder="配件"></el-input>
                 </template>
               </el-table-column>
+              <el-table-column prop="create_data" label="进店时间">
+                <template slot-scope="scope">
+                  <el-date-picker
+                    :disabled="true"
+                    v-model="scope.row.create_data"
+                    type="date"
+                    placeholder="请选择进店时间"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+              <el-table-column prop="finish_date" label="交车时间">
+                <template slot-scope="scope">
+                  <el-date-picker v-model="scope.row.finish_date" type="date" placeholder="请选择交车时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                  </el-date-picker>
+                </template>
+              </el-table-column>
               <el-table-column prop="jobdate" label="工时">
                 <template slot-scope="scope">
-                  <!-- <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> -->
                   <el-input v-model="scope.row.jobdate" placeholder="工时"></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="totalmoney" label="合计">
                 <template slot-scope="scope">
-                  <!-- <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> -->
                   <el-input v-model="scope.row.totalmoney" placeholder="合计"></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="操作">
                 <template slot-scope="scope">
-                  <el-button type="text" size="medium" @click="deleteData(scope.row, scope.$index)">删除 </el-button>
-                  <!-- <el-button type="text" size="medium" @click="editData(scope.row, scope.$index)">修改 </el-button> -->
-                  <el-button type="text" size="medium" @click="save(scope.$index, scope.row)">保存</el-button>
+                  <el-button size="mini" type="primary" v-if="!scope.row.editing" @click="delete1(scope.$index, scope.row)">删除 </el-button>
+                  <el-button size="mini" type="danger" v-if="!scope.row.editing" @click="save(scope.$index, scope.row)">保存</el-button>
                 </template>
               </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 :span="24" class="page">
             <el-pagination
               @current-change="handleCurrentChange"
@@ -152,8 +143,6 @@ export default {
   props: {},
   components: {
     breadcrumb,
-    // dataForm,
-    // dataTable,
   },
   data: function() {
     return {
@@ -165,16 +154,6 @@ export default {
       currentPage: 0,
       pageSize: 7,
       skip: '',
-      // newdata: [],
-      // total: 0,
-      // newfields: [
-      //   { label: '维修项目名', prop: 'name' },
-      //   { label: '类型', prop: 'type' },
-      //   { label: '配件', prop: 'parts' },
-      //   { label: '工时', prop: ' jobdate' },
-      //   { label: '合计', prop: ' totalmoney' },
-      // ],
-      // newopera: [{ label: '删除', method: 'delete' }],
     };
   },
   created() {
@@ -184,15 +163,15 @@ export default {
     ...car({ newquery: 'query', newfetch: 'fetch', newdelete: 'delete', newcreate: 'create', newupdate: 'update' }),
     ...repair(['query', 'create', 'delete', 'update', 'fetch']),
     //查询信息
-    async search() {
+    async search({ skip = 0, limit = 7, ...info } = {}) {
+      skip = this.skip;
       if (this.id) {
         let res = await this.newfetch(this.id);
-        let arr = await this.query({ uid: this.id });
+        let arr = await this.query({ uid: this.id, skip, limit });
         if (this.$checkRes(res)) {
           this.$set(this, `form`, res.data);
           this.$set(this.formData, `tableData`, arr.data);
           this.$set(this, `total`, arr.total);
-          // console.log(this.formData.tableData);
         } else {
           this.$message({
             message: res.errmsg,
@@ -207,17 +186,7 @@ export default {
         edit: true,
       });
     },
-    // async save() {
-    //   let list = this.formData.tableData[this.formData.tableData.length - 1];
-    //   list.uid = this.id;
-    //   const res = await this.create(list);
-    //   if (this.$checkRes(res)) {
-    //     this.$message({
-    //       message: '添加成功',
-    //       type: 'success',
-    //     });
-    //   }
-    // },
+    //保存
     async save(index, row) {
       let data = row;
       if (data.id) {
@@ -236,17 +205,24 @@ export default {
         }
       } else {
         data.uid = this.id;
-        const res = await this.create(data);
-        if (this.$checkRes(res)) {
-          this.$message({
-            message: '创建成功',
-            type: 'success',
-          });
-          this.search();
+        if (data.name || data.type || data.parts || data.finish_date || data.jobdate || data.totalmoney) {
+          const res = await this.create(data);
+          if (this.$checkRes(res)) {
+            this.$message({
+              message: '创建成功',
+              type: 'success',
+            });
+            this.search();
+          } else {
+            this.$message({
+              message: res.errmsg,
+              type: 'error',
+            });
+          }
         } else {
           this.$message({
-            message: res.errmsg,
-            type: 'error',
+            message: '需把信息填写完全，方可保存！',
+            type: 'warning',
           });
         }
       }
@@ -265,12 +241,9 @@ export default {
       row.edit = true;
     },
     //删除
-    // deleteData(row, index) {
-    //   this.formData.tableData.splice(index, 1);
-    // },
-    async todeldeleteDataete(index, row) {
+    async delete1(index, row) {
       if (row.id) {
-        const res = await this.repairdelete(row.id);
+        const res = await this.delete(row.id);
         if (this.$checkRes(res)) {
           this.$message({
             message: '删除成功',
@@ -284,7 +257,7 @@ export default {
           });
         }
       } else {
-        this.list.splice(index, 1);
+        this.formData.tableData.splice(index, 1);
       }
     },
     back() {