样式

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -237,11 +237,7 @@
       </el-table>
     </el-card>
 
-<<<<<<< HEAD
     <el-dialog :visible.sync="dialogeditVisible" :title="title" width="400px" center >
-=======
-    <el-dialog :visible.sync="dialogeditVisible" title="停产" width="400px" center >
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form" :model="form" label-position="left">
         <el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
           <el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
@@ -324,10 +320,7 @@ export default {
       MachineDrawing: [], // 机床图号下拉框
       TeamValue: '', // 组号
       Team: [], // 组号下拉框
-<<<<<<< HEAD
       title: '',
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       currentPage1: 1,
       pageSize1: 10,
       total1: null,
@@ -452,12 +445,8 @@ export default {
       this.remark1 = ''
       this.remark2 = ''
       this.form2.reason = ''
-<<<<<<< HEAD
       this.title = row.零件名称
       this.form2.time = new Date()
-=======
-      this.form2.time = ''
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogeditVisible = true
       this.form.input1 = row.零件图号
       if (row.批次零件状态 === '2') {