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

src/views/company/index.vue

@@ -61,54 +61,60 @@
           <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-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-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>
+                  <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-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>
+                  <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-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>
+                  <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="jobdate" label="工时">
                 <template slot-scope="scope">
-                  <el-form-item v-if="scope.row.edit" :prop="'tableData.' + scope.$index + '.jobdate'">
+                  <!-- <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>
+                  <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-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>
+                  <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="editData(scope.row, scope.$index)">修改 </el-button> -->
+                  <el-button type="text" size="medium" @click="save(scope.$index, scope.row)">保存</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -191,50 +197,49 @@ export default {
         edit: true,
       });
     },
-    async save() {
-      // console.log(this.formData.tableData);
-      let list = this.formData.tableData[this.formData.tableData.length - 1];
-      list.uid = this.id;
-      // console.log(list);
-      const res = await this.create(list);
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '添加成功',
-          type: 'success',
-        });
+    // 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) {
+        const res = await this.update(data);
+        if (this.$checkRes(res)) {
+          this.$message({
+            message: '修改成功',
+            type: 'success',
+          });
+          this.search();
+        } else {
+          this.$message({
+            message: res.errmsg,
+            type: 'error',
+          });
+        }
+      } else {
+        data.uid = this.id;
+        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',
+          });
+        }
       }
-      // this.search();
-      // if (data.id) {
-      //   const res = await this.newupdate(data);
-      //   if (this.$checkRes(res)) {
-      //     this.$message({
-      //       message: '修改成功',
-      //       type: 'success',
-      //     });
-      //     this.coltoClose();
-      //   } else {
-      //     this.$message({
-      //       message: '修改失败',
-      //       type: 'error',
-      //     });
-      //   }
-      // } else {
-      //   const res = await this.newcreate(data);
-      //   if (this.$checkRes(res)) {
-      //     this.$message({
-      //       message: '添加成功',
-      //       type: 'success',
-      //     });
-      //     this.coltoClose();
-      //   } else {
-      //     this.$message({
-      //       message: '添加失败',
-      //       type: 'error',
-      //     });
-      //   }
-      // }
-      // this.coldialog = false;
-      // this.search();
     },
     //确认添加
     confirmAdd(row, formName) {