src/views/repair/Components/OtherChoose.vue

@@ -8,20 +8,7 @@
             <span>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="名称" prop="name" :show-overflow-tooltip="true" width="180" />
-          width="180"
-          align="right">
-          <template slot="header" slot-scope="scope">
-            <el-input
-              v-model="queryParams.name"
-              size="mini"
-              @keyup.enter.native="getPage"
-              placeholder="输入关键字搜索"/>
-          </template>
-          <template slot-scope="scope">
-            {{scope.row.name}}
-          </template>
-        </el-table-column>
         <el-table-column label="价格" prop="price" :show-overflow-tooltip="true" width="180"/>
       </el-table>
       <pagination @pagination="getPage" v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@@ -44,17 +31,11 @@ export default {
       queryParams:{
         pageNo: 1,
         pageSize: 10,
-        name:undefined
       },
       loading: true
     }
   },
   mounted() {
-    this.queryParams={
-      pageNo: 1,
-        pageSize: 10,
-        name:undefined
-    }
     this.getPage()
   },
   methods: {

src/views/repair/Components/PartChoose.vue

@@ -7,21 +7,7 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="商品名称" prop="name" width="120"/>-->
+      <el-table-column label="商品名称" prop="name" width="120"/>
-      <el-table-column
-        width="180"
-        align="right">
-        <template slot="header" slot-scope="scope">
-          <el-input
-            v-model="queryParams.name"
-            size="mini"
-            @keyup.enter.native="listPart"
-            placeholder="输入关键字搜索"/>
-        </template>
-        <template slot-scope="scope">
-          {{scope.row.name}}
-        </template>
-      </el-table-column>
       <el-table-column label="规格" prop="model" width="120"/>
       <el-table-column label="商品编码" prop="code" width="120"/>
       <el-table-column label="可用库存" prop="stock" width="80"/>
@@ -93,19 +79,13 @@ export default {
       ],
       queryParams: {
         pageNo: 1,
-        pageSize: 10,
+        pageSize: 10
-        name:undefined
       },
       total: 2,
       loading: true
     }
   },
   mounted() {
-    this.queryParams={
-      pageNo: 1,
-      pageSize: 10,
-      name:undefined
-    }
     this.listPart()
   },
   methods: {

src/views/repair/Components/ProjectChoose.vue

@@ -8,21 +8,7 @@
             <span>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-<!--        <el-table-column label="商品名称" prop="name" :show-overflow-tooltip="true" width="180" />-->
+        <el-table-column label="商品名称" prop="name" :show-overflow-tooltip="true" width="180" />
-        <el-table-column
-          width="180"
-          align="right">
-          <template slot="header" slot-scope="scope">
-            <el-input
-              v-model="queryParams.name"
-              size="mini"
-              @keyup.enter.native="listPage"
-              placeholder="输入关键字搜索"/>
-          </template>
-          <template slot-scope="scope">
-            {{scope.row.name}}
-          </template>
-        </el-table-column>
         <el-table-column label="规格" prop="spec" :show-overflow-tooltip="true" width="180"/>
         <el-table-column label="商品编码" prop="code" :show-overflow-tooltip="true" width="180"/>
       </el-table>
@@ -46,17 +32,11 @@ export default {
       total: 0,
       queryParams:{
         pageNo: 1,
-        pageSize: 10,
+        pageSize: 10
-        name:undefined
       }
     }
   },
   mounted() {
-    this.queryParams={
-      pageNo: 1,
-      pageSize: 10,
-      name:undefined
-    }
     this.listPage()
   },
   methods: {

src/views/repair/project/form/RepairProjectForm.vue

@@ -201,10 +201,10 @@ export default {
           return;
         }
         // 添加的提交
-        const res = await RepairProjectApi.createRepairProject(data);
+        await RepairProjectApi.createRepairProject(data);
         this.$modal.msgSuccess("新增成功");
         this.dialogVisible = false;
-        this.$emit('success',res.data);
+        this.$emit('success');
       } finally {
         this.formLoading = false;
       }

src/views/repair/tickets/Components/TicketItem.vue

@@ -113,7 +113,7 @@
     </el-table>
 
     <WaresForm ref="partFormRef" class="noPadding" @success="returnPart"/>
-    <RepairProjectForm class="noPadding" ref="projectFormRef"  @success="returnProject"/>
+    <RepairProjectForm class="noPadding" ref="projectFormRef" @success="returnProject"/>
     <OtherForm ref="otherFormRef" class="noPadding" @success="returnOther"/>
   </div>
 </template>
@@ -333,12 +333,11 @@ export default {
           break
       }
     },
-    returnProject(row) {
+    returnProject() {
-      // this.list.push(row)
+      // console.log("新增项目回调")
-
     },
-    returnPart(row) {
+    returnPart() {
-      // this.list.push(row)
+      // console.log("新增配件回调")
     },
     returnOther() {
 

src/views/repair/wares/WaresForm.vue

@@ -216,6 +216,7 @@ export default {
       // 表单校验
       formRules: {
         name: [{required: true, message: '商品名称不能为空', trigger: 'blur'}],
+        barCode: [{required: true, message: '条形码不能为空', trigger: 'blur'}],
         price: [{required: true, message: '销售价格不能为空', trigger: 'blur'}],
         unit: [{required: true, message: '计量单位不能为空', trigger: 'blur'}],
         type: [{required: true, message: '所属分类不能为空', trigger: 'blur'}],
@@ -294,10 +295,10 @@ export default {
           return;
         }
         // 添加的提交
-        const res = await WaresApi.createWares(data);
+        await WaresApi.createWares(data);
         this.$modal.msgSuccess("新增成功");
         this.dialogVisible = false;
-        this.$emit('success',res.data);
+        this.$emit('success');
       } finally {
         this.formLoading = false;
       }