样式

src/views/MarketingCenter/DeliveryApplication/index.vue

@@ -3,11 +3,7 @@
     <el-card class="box-card">
       <div>
         <el-row>
-<<<<<<< HEAD
           <el-button :disabled="disabledAdd" type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">新增</el-button>
-=======
-          <el-button :disabled="disabledAdd" type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">增加</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-button :disabled="disabledEdit" type="warning" icon="el-icon-edit" size="mini" @click="function_InvoiceEdit">编辑</el-button>
           <el-button :disabled="disabledSave" type="success" icon="el-icon-upload" size="mini" @click="function_InvoiceSave">保存</el-button>
           <el-button :disabled="disabledExamine" type="success" icon="el-icon-lock" size="mini" @click="function_InvoiceExamine">核准</el-button>
@@ -44,11 +40,7 @@
         <!--<el-button icon="el-icon-refresh" size="mini" @click="function_Refresh">刷新</el-button>-->
 
       </div>
-<<<<<<< HEAD
       <el-divider class="fengexian" content-position="right"><el-button type="text" class="el-icon-caret-bottom" @click="show = !show">  展开</el-button></el-divider>
-=======
-      <el-divider content-position="right"><el-button type="text" class="el-icon-caret-bottom" @click="show = !show">  展开</el-button></el-divider>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <div v-show="show" style="margin-top: 20px" class="transition-box">
         <el-collapse-transition>
           <div class="text item">
@@ -77,11 +69,7 @@
                   size="mini"/>
               </el-col>
             </el-row>
-<<<<<<< HEAD
             <el-row style="margin-top: 5px">
-=======
-            <el-row style="margin-top: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-col :span="24">
                 <span style="width:80px;display:inline-block;">车辆牌号：</span>
                 <el-input
@@ -106,11 +94,7 @@
                   size="mini"/>
               </el-col>
             </el-row>
-<<<<<<< HEAD
             <el-row style="margin-top: 5px">
-=======
-            <el-row style="margin-top: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-col :span="24">
                 <span style="width:80px;display:inline-block;">制单人：</span>
                 <el-input
@@ -135,11 +119,7 @@
                   size="mini"/>
               </el-col>
             </el-row>
-<<<<<<< HEAD
             <el-row style="margin-top: 5px">
-=======
-            <el-row style="margin-top: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-col :span="24">
                 <span style="width:80px;display:inline-block;">制单日期：</span>
                 <el-date-picker
@@ -159,11 +139,7 @@
                   placeholder="结束日期"/>
               </el-col>
             </el-row>
-<<<<<<< HEAD
             <el-row style="margin-top: 5px">
-=======
-            <el-row style="margin-top: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-col :span="24">
                 <span style="width:80px;display:inline-block;">核准日期：</span>
                 <el-date-picker
@@ -183,11 +159,7 @@
                   placeholder="结束日期"/>
               </el-col>
             </el-row>
-<<<<<<< HEAD
             <el-row style="margin-top: 5px">
-=======
-            <el-row style="margin-top: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-col :span="24">
                 <span style="width:80px;display:inline-block;">发货日期：</span>
                 <el-date-picker
@@ -312,11 +284,7 @@
         :data="tableData"
         highlight-current-row
         style="width: 100%"
-<<<<<<< HEAD
         height="560"
-=======
-        height="300"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         border
         size="mini">
         <el-table-column align="center" label="货品类别" width="80">
@@ -365,11 +333,7 @@
               :disabled="disabledDetailsDelete"
               size="mini"
               type="text"
-<<<<<<< HEAD
               icon="el-icon-delete"
-=======
-              icon="el-icon-delete-solid"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               @click.native.prevent="deleteRow(scope.$index, tableData)"
             >删除</el-button>
           </template>
@@ -498,10 +462,7 @@
               style="width: 100%"
               height="200"
               border
-<<<<<<< HEAD
               stripe
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               size="mini"
               @selection-change="handleSelectionChangeMachine">
               <el-table-column
@@ -617,11 +578,7 @@
               {{ scope.row.发货人 }}
             </template>
           </el-table-column>
-<<<<<<< HEAD
           <el-table-column align="center" label="制单时间" show-overflow-tooltip>
-=======
-          <el-table-column align="center" label="制单时间">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <template slot-scope="scope">
               {{ scope.row.操作日期 }}
             </template>
@@ -1245,22 +1202,15 @@ export default {
 </style>
 
 <style scoped>
-<<<<<<< HEAD
   .el-divider{
     margin: 5px;
   }
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   .text {
     font-size: 14px;
   }
 
   .item {
-<<<<<<< HEAD
     margin-bottom: 5px;
-=======
-    margin-bottom: 18px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 
   .clearfix:before,
@@ -1271,10 +1221,4 @@ export default {
   .clearfix:after {
     clear: both
   }
-<<<<<<< HEAD
-=======
-  .el-card{
-    margin-top: 2px;
-  }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 </style>