样式

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <el-card>
-<<<<<<< HEAD
       <div>
         <span style="margin-left: 0">机床号：</span>
         <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-top: 3px" clearable @change="machineChange">
@@ -33,63 +32,14 @@
             :value="item.value"/>
         </el-select>
         <el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
-=======
-      <div slot="header">
-        <el-row>
-          <el-col style="width: 280px">
-            <span>机床号：</span>
-            <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
-              <el-option
-                v-for="item in machineNumber"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-                <div style="float: left">{{ item.label }}</div>
-                <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
-              </el-option>
-            </el-select>
-          </el-col>
-          <el-col style="width: 270px">
-            <span>组号：</span>
-            <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
-              <el-option
-                v-for="item in groupNumber"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-          <el-col style="width: 280px">
-            <span>零件号：</span>
-            <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px"/>
-          </el-col>
-          <el-col style="width: 290px">
-            <span>工艺员：</span>
-            <el-select v-model="personValue" placeholder="工艺员" size="small" clearable style="width: 100px">
-              <el-option
-                v-for="item in person"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-            <el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
-          </el-col>
-        </el-row>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       </div>
       <el-table
         v-loading="loading"
         :data="tableData"
-<<<<<<< HEAD
         size="mini"
         height="730"
         border
         stripe
-=======
-        style="max-height: 550px"
-        height="550"
-        border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         highlight-current-row
         @selection-change="handleSelectionChange"
         @row-click="click">
@@ -140,7 +90,6 @@
       </div>
     </el-card>
     <el-card>
-<<<<<<< HEAD
       <div>
         <el-tooltip effect="dark" content="将在制零件打回，重新编制工艺定额" placement="top">
           <div style="display: inline-block">
@@ -150,11 +99,6 @@
       </div>
     </el-card>
     <el-dialog :visible.sync="dialogFormVisiblePeople" title="工艺流程单" center>
-=======
-      <div slot="header">
-        <el-button v-show="true" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>
-      </div>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <div v-if="tableData2.length">
         <table class="tg">
           <tr>
@@ -222,11 +166,7 @@
           </tr>
         </table>
       </div>
-<<<<<<< HEAD
     </el-dialog>
-=======
-    </el-card>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   </div>
 </template>
 
@@ -245,21 +185,14 @@ export default {
       personValue: '',
       person: [],
       pageCurrent: 1,
-<<<<<<< HEAD
       pageSize: 20,
-=======
-      pageSize: 10,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       total: 0,
       tableData: [],
       loading: false,
       PrNum: '',
       tableData2: [],
       tableData3: [],
-<<<<<<< HEAD
       dialogFormVisiblePeople: false,
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       机床号: '',
       组号: '',
       零件图号: '',
@@ -352,10 +285,7 @@ export default {
       this.零件图号 = row.零件图号
       searchtable1(row.工艺计划流水号).then(response => {
         this.tableData2 = response.data
-<<<<<<< HEAD
         this.dialogFormVisiblePeople = true
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       })
     },
     handleSelectionChange(val) {
@@ -389,16 +319,4 @@ export default {
   .tg .tg-x61c{font-weight:bold;font-size:28px;border-color:inherit;text-align:center;vertical-align:top}
 </style>
 <style scoped>
-<<<<<<< HEAD
-=======
-  span{
-    margin: 10px 0 10px 10px;
-  }
-  .el-card{
-    margin-bottom: 15px;
-  }
-    .el-col{
-        margin-bottom: 10px;
-    }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 </style>