样式

src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue

@@ -6,11 +6,7 @@
         <el-radio :label="2">全部</el-radio>
       </el-radio-group>
       <span>机床图号:</span>
-<<<<<<< HEAD
       <el-select v-model="graphNumValue" filterable size="small" style="margin:3px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
-=======
-      <el-select v-model="graphNumValue" filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in graphNum"
           :key="item.value"
@@ -20,26 +16,16 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
         </el-option>
       </el-select>
-<<<<<<< HEAD
       <span style="margin-left: 10px">组号:</span>
       <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=20;getTable()">
-=======
-      <span>组号:</span>
-      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in GroupNum"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
       <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
       <el-button type="primary" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
-=======
-      <el-button type="primary" size="small" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
-      <el-button type="primary" size="small" icon="el-icon-cjn-09" style="" @click="save">保存</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     </el-card>
 
     <el-card>
@@ -47,17 +33,11 @@
         ref="multipleTable"
         :data="tableData"
         style="width: 100%;"
-<<<<<<< HEAD
         size="mini"
         height="770"
         highlight-current-row
         border
         stripe
-=======
-        height="580"
-        highlight-current-row
-        border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection"/>
         <el-table-column align="center" label="零件号">
@@ -109,7 +89,6 @@
       </div>
     </el-card>
 
-<<<<<<< HEAD
     <el-dialog :visible.sync="dialogFormVisible" title="选择工艺定额人员" center>
       <el-table
         :data="tableData2"
@@ -117,13 +96,6 @@
         size="mini"
         border
         stripe
-=======
-    <el-dialog :visible.sync="dialogFormVisible" title="工艺定额人员选择" center>
-      <el-table
-        :data="tableData2"
-        style="width: 100%;max-height: 200px"
-        border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         height="200px"
         highlight-current-row
         @row-click="confirmPerson">
@@ -181,11 +153,7 @@ export default {
       multipleSelection: [],
       result: 0,
       PageCurrent: 1,
-<<<<<<< HEAD
       PageSize: 20,
-=======
-      PageSize: 10,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       total: 0
     }
   },
@@ -398,15 +366,7 @@ export default {
 </script>
 
 <style scoped>
-<<<<<<< HEAD
   span{
    margin-right: 10px;
-=======
-  .el-card{
-    margin-bottom: 15px;
-  }
-  span{
-    margin: 10px 0 10px 10px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 </style>