提交代码

SC-web/src/views/scm/basicInformation/receiptout/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="JNPF-common-layout">
 
-<<<<<<< HEAD
+
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
@@ -93,7 +93,7 @@
         <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
                     @pagination="initData"/>
       </div>
-=======
+
       <div class="JNPF-common-layout-center">
         <el-row class="JNPF-common-search-box" :gutter="16">
           <el-form @submit.native.prevent>
@@ -138,7 +138,8 @@
               <screenfull isContainer/>
             </div>
           </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange" border>
+          <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+                      @selection-change="handleSelectionChange" border>
             <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
             />
             <el-table-column prop="customerId" label="客户名称" width="0" align="left"
@@ -189,13 +190,15 @@ width="150" >
               </template>
             </el-table-column>
           </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+          <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                      @pagination="initData"/>
         </div>
       </div>
       <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
       <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
       <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
+
+    </div>
   </div>
 </template>
 

SC-web/src/views/scm/basicInformation/saleorder/index.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="JNPF-common-layout">
 
-<<<<<<< HEAD
     <div class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
@@ -93,7 +92,7 @@
         <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
           @pagination="initData" />
       </div>
-=======
+
         <div class="JNPF-common-layout-center">
             <el-row class="JNPF-common-search-box" :gutter="16">
                 <el-form @submit.native.prevent>
@@ -209,7 +208,8 @@ width="150" >
         <JNPF-Form5 v-if="formVisible" ref="JNPFForm5" @refresh="refresh"/>
         <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
         <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
+
+    </div>
     </div>
 </template>