Code merge

src/views/delivery/index.vue

@@ -1,57 +1,4 @@
 <template>
-<<<<<<< HEAD
-	<div class="app-container">
-		<el-row type="flex" justify="space-around" style="margin-bottom: 20px">
-			<div class="grid-content bg-purple">
-				<el-input placeholder="请输入供应商名称" v-model="formData.name" @change="Search" clearable style="width: 100%">
-					<i slot="prefix" class="el-input__icon el-icon-search"></i>
-				</el-input>
-			</div>
-			<div class="grid-content bg-purple">
-				<el-dropdown @command="handleCommand">
-					<div class="pulldown">
-						<span class="el-dropdown-link" v-if="!providerStatus">
-							供应商状态
-						</span>
-						<span class="el-dropdown-link" v-if="providerStatus">
-							{{ providerStatus }}
-						</span>
-						<i class="el-icon-arrow-down el-icon--right"></i>
-					</div>
-					<el-dropdown-menu slot="dropdown">
-						<el-dropdown-item command="供应商状态">供应商状态</el-dropdown-item>
-						<el-dropdown-item command="正常">正常</el-dropdown-item>
-						<el-dropdown-item command="删除">删除</el-dropdown-item>
-					</el-dropdown-menu>
-				</el-dropdown>
-			</div>
-			<div class="grid-content bg-purple">
-				<el-dropdown @command="AhandleCommand">
-					<div class="pulldown">
-						<span v-if="!Auditstatus" class="el-dropdown-link"> 审核状态 </span>
-						<span v-if="Auditstatus" class="el-dropdown-link">
-							{{ Auditstatus }}
-						</span>
-						<i class="el-icon-arrow-down el-icon--right" />
-					</div>
-					<el-dropdown-menu slot="dropdown">
-						<el-dropdown-item command="审核状态">审核状态</el-dropdown-item>
-						<el-dropdown-item command="已认证">已认证</el-dropdown-item>
-						<el-dropdown-item command="未认证">未认证</el-dropdown-item>
-					</el-dropdown-menu>
-				</el-dropdown>
-			</div>
-			<!-- 日期查询 -->
-			<div class="grid-content bg-purple">
-				<div class="block">
-					<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
-						start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
-						:picker-options="pickerOptions" @change="startEndTime">
-					</el-date-picker>
-				</div>
-			</div>
-		</el-row>
-=======
   <div class="app-container">
     <el-row type="flex" justify="space-around" style="margin-bottom: 20px">
       <div class="grid-content bg-purple">
@@ -118,8 +65,6 @@
         </div>
       </div>
     </el-row>
->>>>>>> 951469852c7c474e7fbf44d8d7e4057cd805cef6
-
 		<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
 			highlight-current-row @selection-change="handleSelectionChange" @select-all="handleAll">
 			<el-table-column type="selection"> </el-table-column>