同上

vue/src/views/pg-fis/basedate/planControl_V2/index.vue

@@ -3,29 +3,15 @@
 	<div class="cr-body-content">
 		<div ref="box">
 			<flexbox class="content-header" id="planControl-content-header">
-		  <el-form
+				<el-form :model="listQuery" ref="searchForm" v-show="showSearch" :inline="true">
-			:model="listQuery"
-			ref="searchForm"
-			v-show="showSearch"
-			:inline="true">
 
 
 					<el-form-item label="底盘号" prop="vin">
-				<el-input
+						<el-input v-model="listQuery.vin" clearable size="small" style="width: 120px" />
-					v-model="listQuery.vin"
-					clearable
-					size="small"
-					style="width: 120px"
-				/>
 					</el-form-item>
 
 					<el-form-item label="车型代码" prop="vehicleModelCode">
-				<el-input
+						<el-input v-model="listQuery.vehicleModelCode" clearable size="small" style="width: 120px" />
-					v-model="listQuery.vehicleModelCode"
-					clearable
-					size="small"
-					style="width: 120px"
-				/>
 					</el-form-item>
 
 					<el-form-item label="车型名称" prop="vehicleModelName">
@@ -33,137 +19,53 @@
 					</el-form-item>
 
 					<el-form-item label="涂装下线时间" prop="paintOfflineTimeBegin">
-				<el-date-picker
+						<el-date-picker v-model="listQuery.paintOfflineTimeBegin" size="small" style="width: 200px" type="datetime"></el-date-picker>
-					v-model="listQuery.paintOfflineTimeBegin"
-					size="small"
-					style="width: 200px"
-					type="datetime"
-				></el-date-picker>
 					</el-form-item>
 					<el-form-item label="-" prop="paintOfflineTimeEnd">
-				<el-date-picker
+						<el-date-picker v-model="listQuery.paintOfflineTimeEnd" size="small" style="width: 200px" type="datetime"></el-date-picker>
-					v-model="listQuery.paintOfflineTimeEnd"
-					size="small"
-					style="width: 200px"
-					type="datetime"
-				></el-date-picker>
 					</el-form-item>
 
 					<el-form-item label="总装上线时间" prop="onlineTimeBegin">
-				<el-date-picker
+						<el-date-picker v-model="listQuery.onlineTimeBegin" size="small" style="width: 200px" type="datetime"></el-date-picker>
-					v-model="listQuery.onlineTimeBegin"
-					size="small"
-					style="width: 200px"
-					type="datetime"
-				></el-date-picker>
 					</el-form-item>
 					<el-form-item label="-" prop="onlineTimeEnd">
-				<el-date-picker
+						<el-date-picker v-model="listQuery.onlineTimeEnd" size="small" style="width: 200px" type="datetime"></el-date-picker>
-					v-model="listQuery.onlineTimeEnd"
-					size="small"
-					style="width: 200px"
-					type="datetime"
-				></el-date-picker>
 					</el-form-item>
 
 					<el-form-item label="序列号" prop="serialNumBegin">
-				<el-input
+						<el-input v-model="listQuery.serialNumBegin" clearable size="small" style="width: 120px" />
-					v-model="listQuery.serialNumBegin"
-					clearable
-					size="small"
-					style="width: 120px"
-				/>
 					</el-form-item>
 					<el-form-item label="-" prop="serialNumEnd">
-				<el-input
+						<el-input v-model="listQuery.serialNumEnd" clearable size="small" style="width: 120px" />
-					v-model="listQuery.serialNumEnd"
-					clearable
-					size="small"
-					style="width: 120px"
-				/>
 					</el-form-item>
 
 					<el-form-item label="物流配货顺序号" prop="hostSNBegin">
-				<el-input
+						<el-input v-model="listQuery.hostSNBegin" clearable size="small" style="width: 120px" />
-					v-model="listQuery.hostSNBegin"
-					clearable
-					size="small"
-					style="width: 120px"
-				/>
 					</el-form-item>
 					<el-form-item label="-" prop="hostSNEnd">
-				<el-input
+						<el-input v-model="listQuery.hostSNEnd" clearable size="small" style="width: 120px" />
-					v-model="listQuery.hostSNEnd"
-					clearable
-					size="small"
-					style="width: 120px"
-				/>
 					</el-form-item>
 
 					<el-form-item label="创建时间" prop="createTimeBegin">
-				<el-date-picker
+						<el-date-picker v-model="listQuery.createTimeBegin" size="small" style="width: 200px" type="datetime"></el-date-picker>
-					v-model="listQuery.createTimeBegin"
-					size="small"
-					style="width: 200px"
-					type="datetime"
-				></el-date-picker>
 					</el-form-item>
 					<el-form-item label="-" prop="createTimeEnd">
-				<el-date-picker
+						<el-date-picker v-model="listQuery.createTimeEnd" size="small" style="width: 200px" type="datetime"></el-date-picker>
-					v-model="listQuery.createTimeEnd"
-					size="small"
-					style="width: 200px"
-					type="datetime"
-				></el-date-picker>
 					</el-form-item>
 
 					<el-form-item label="导入时间" prop="importTimeBegin">
-				<el-date-picker
+						<el-date-picker v-model="listQuery.importTimeBegin" size="small" style="width: 200px" type="datetime"></el-date-picker>
-					v-model="listQuery.importTimeBegin"
-					size="small"
-					style="width: 200px"
-					type="datetime"
-				></el-date-picker>
 					</el-form-item>
 					<el-form-item label="-" prop="importTimeEnd">
-				<el-date-picker
+						<el-date-picker v-model="listQuery.importTimeEnd" size="small" style="width: 200px" type="datetime"></el-date-picker>
-					v-model="listQuery.importTimeEnd"
-					size="small"
-					style="width: 200px"
-					type="datetime"
-				></el-date-picker>
 					</el-form-item>
 
 					<el-form-item>
-			  <el-button
+						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
-				type="primary"
+						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('searchForm')">重置</el-button>
-				icon="el-icon-search"
+						<el-button type="warning" plain icon="el-icon-download" size="mini" style="margin-left: 15px" @click="handleDownload()">导出(Excel)查询信息
-				size="mini"
-				@click="handleFilter"
-				>搜索</el-button
-			  >
-			  <el-button
-				icon="el-icon-refresh"
-				size="mini"
-				@click="resetQuery('searchForm')"
-				>重置</el-button
-			  >
-			  <el-button
-				type="warning"
-				plain
-				icon="el-icon-download"
-				size="mini"
-				style="margin-left: 15px"
-				@click="handleDownload()"
-				>导出(Excel)查询信息
 						</el-button>
-			  <el-button 
+						<el-button class="filter-item" size="mini" type="success" icon="el-icon-plus" @click="handleImport">导入
-			  	class="filter-item" 
-				size="mini" 
-				type="success" 
-				icon="el-icon-plus" 
-				@click="handleImport" 
-				>导入
 						</el-button>
 					</el-form-item>
 					<el-form-item>
@@ -174,33 +76,11 @@
 		</div>
 		<div class="l-table">
 			<!--表格渲染-->
-		<el-table
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
-		  ref="multipleTable"
+			 class="cr-table" :data="list" :height="tableHeight" size="small" stripe border highlight-current-row style="width: 100%"
-		  v-loading="listLoading"
+			 @sort-change="sortChange" @selection-change="handleSelectionChange" @row-click="handleRowClick">
-		  element-loading-text="拼命加载中..."
+				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
-		  element-loading-spinner="el-icon-loading"
+				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" :gutter="0">
-		  class="cr-table"
-		  :data="list"
-		  :height="tableHeight"
-		  size="small"
-		  stripe
-		  border
-		  highlight-current-row
-		  style="width: 100%"
-		  @sort-change="sortChange"
-		  @selection-change="handleSelectionChange"
-		  @row-click="handleRowClick"
-		>
-		  <el-table-column
-			v-for="(item, index) in getDefaultField"
-			:key="index"
-			:prop="item.prop"
-			:label="item.label"
-			:min-width="item.width"
-			:formatter="fieldFormatter"
-			sortable="custom"
-			:gutter="0"
-		  >
 					<template slot="header" slot-scope="scope">
 						{{ scope.column.label }}
 					</template>
@@ -211,20 +91,10 @@
 
 		<div class="table-footer">
 			<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-		<pagination
+			<pagination v-show="totalCount > 0" :total="totalCount" :page.sync="page" :limit.sync="listQuery.MaxResultCount"
-		  v-show="totalCount > 0"
+			 @pagination="getList" />
-		  :total="totalCount"
-		  :page.sync="page"
-		  :limit.sync="listQuery.MaxResultCount"
-		  @pagination="getList"
-		/>
 			<!-- 导入Excel组件 -->
-		<importExcel
+			<importExcel ref="importexcel" :show="showExcelImport" :importURL="importExcelURL" @close="importClose" />
-		  ref="importexcel"
-		  :show="showExcelImport"
-		  :importURL="importExcelURL"
-		  @close="importClose"
-		/>
 		</div>
 	</div>
 </template>
@@ -234,11 +104,15 @@
 	import permission from "@/directive/permission/index.js";
 	import CRMTableHead from "../../components/CRMTableHead";
 	import importExcel from "@/components/ImportExcel-normal";
-  import { mapGetters } from "vuex";
+	import {
+		mapGetters
+	} from "vuex";
 	import Lockr from "lockr";
 	import moment from "moment";
 	import message_table from "../../components/mixins/message_table";
-  import { downloadFile } from "@/utils/crmindex.js";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
 
 	//组件计量单位
 	//  const bomUnit = [
@@ -253,8 +127,14 @@
 
 	export default {
 		name: "RepeatM100",
-	components: { Pagination, CRMTableHead, importExcel },
+		components: {
-	directives: { permission },
+			Pagination,
+			CRMTableHead,
+			importExcel
+		},
+		directives: {
+			permission
+		},
 		mixins: [message_table],
 		data() {
 			return {
@@ -541,7 +421,10 @@
 				this.getList();
 			},
 			sortChange(data) {
-		const { prop, order } = data;
+				const {
+					prop,
+					order
+				} = data;
 				if (!prop || !order) {
 					this.listQuery.Sorting = undefined
 					this.handleFilter();
@@ -602,6 +485,7 @@
 
 <style lang="scss" scoped>
 	@import "../../../pg-fis/styles/crmtable.scss";
+
 	.tipper {
 		border: solid 1px #ddd;
 		border-radius: 5px;
@@ -610,5 +494,3 @@
 		line-height: 20px;
 	}
 </style>
-  
-