列表排序

src/utils/request.js

@@ -76,7 +76,7 @@ service.interceptors.response.use(
         Message({
             message: error.message,
             type: 'error',
-            duration: 5 * 1000
+            duration: 30 * 1000
         })
         return Promise.reject(error)
     }

src/views/device/allocation/index.vue

@@ -369,7 +369,7 @@ export default {
         length: 20,
         sn: '',
         type: null,
-        sort: '',
+        sort: 'add_time desc',
         recordTimeStart: '',
         recordTimeEnd: '',
       },
@@ -471,7 +471,7 @@ export default {
         length: 20,
         sn: '',
         type: null,
-        sort: '',
+        sort: 'add_time desc',
         recordTimeStart: '',
         recordTimeEnd: '',
       }

src/views/device/delivery/batchOut.vue

@@ -114,7 +114,7 @@ export default {
         length: 20,
         sn: '',
         type: null,
-        sort: '',
+        sort: 'instorageTime desc',
         batchNum: ''
       },
 			/**是否显示新增弹窗 */
@@ -146,7 +146,7 @@ export default {
         length: 20,
         sn: '',
         type: null,
-        sort: '',
+        sort: 'instorageTime desc',
         batchNum: ''
       }
       this.getDataList()

src/views/device/delivery/index.vue

@@ -379,7 +379,7 @@ export default {
         length: 20,
         sn: '',
         outType: null,
-        sort: '',
+        sort: 'add_time desc',
         recordTimeEnd: '',
         recordTimeStart: '',
       },
@@ -446,7 +446,7 @@ export default {
         length: 20,
         sn: '',
         outType: null,
-        sort: '',
+        sort: 'add_time desc',
         recordTimeEnd: '',
         recordTimeStart: '',
       }

src/views/device/handle/index.vue

@@ -300,7 +300,7 @@ export default {
         title: undefined,
         type: undefined,
         sort: '',
-        sn: ''
+        sn: 'handleTime desc'
       },
 			/**是否显示新增弹窗 */
 			addVisible: false,
@@ -342,7 +342,7 @@ export default {
         title: undefined,
         type: undefined,
         sort: '',
-        sn: ''
+        sn: 'handleTime desc'
       }
       this.getDataList()
     },

src/views/device/info/details.vue

@@ -143,7 +143,7 @@ export default {
       //状态选项
       statusOptins: [
         {label: '全部', value: null},
-        {label: '已入库', value: 1},
+        {label: '库存', value: 1},
         {label: '未入库', value: 0},
         {label: '已调拨', value: 2},
         {label: '已出库', value: 3},
@@ -151,7 +151,7 @@ export default {
       ],
       //电池总量
       totalData: 0,
-      //已入库电池
+      //库存电池
       storage: 0,
     }
   },

src/views/device/info/index.vue

@@ -86,7 +86,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="已入库">
+          <el-table-column label="库存">
             <template slot-scope="scope">
               {{ scope.row.in_storage || 0 }}
             </template>
@@ -211,7 +211,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="已入库" width="80">
+          <el-table-column label="库存" width="80">
             <template slot-scope="scope">
               {{ scope.row.in_storage || '-' }}
             </template>
@@ -337,7 +337,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="已入库" width="80">
+          <el-table-column label="库存" width="80">
             <template slot-scope="scope">
               {{ scope.row.in_storage + scope.row.handle + scope.row.out_storage + scope.row.transfer || '-' }}
             </template>
@@ -406,12 +406,12 @@ export default {
 			/**查询条件对象 */
 			listQuery: {
         index: 1,
-        length: 10,
+        length: 20,
         batchNum: '',
         sn: '',
         imei: '',
         orderBy: '',
-        sort: '',
+        sort: 'add_time desc',
         time: [],
         recordTimeStart: '',
         recordTimeEnd: '',
@@ -530,15 +530,15 @@ export default {
     resetForm() {
       this.listQuery = {
         index: 1,
-        length: 10,
+        length: 20,
         batchNum: '',
         sn: '',
         imei: '',
         orderBy: '',
-        sort: '',
+        sort: 'add_time desc',
         time: [],
-        recordTimeStart: null,
-        recordTimeEnd: null,
+        recordTimeStart: '',
+        recordTimeEnd: '',
       }
       this.getDataList()
     },

src/views/device/storage/index.vue

@@ -4,7 +4,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="电池" name="first">
         <div class="top-info">
-          总录入电池 <span>{{dataTotle.total}}</span>，已入库电池 <span>{{dataTotle.inStorage}}</span>，未入库电池 <span style="color: #D9001B;">{{dataTotle.notInStorage}}</span>
+          总录入电池 <span>{{dataTotle.total}}</span>，库存电池 <span>{{dataTotle.inStorage}}</span>，未入库电池 <span style="color: #D9001B;">{{dataTotle.notInStorage}}</span>
         </div>
 
         <el-form :inline="true" :model="listQuery" @keyup.enter.native="searchHandle()">
@@ -126,7 +126,7 @@
       </el-tab-pane>
       <el-tab-pane label="电动车" name="second">
         <div class="top-info">
-          总录入电动车 <span>1864</span>，已入库电动车 <span>200</span>，未入库电动车 <span style="color: #D9001B;">200</span>
+          总录入电动车 <span>1864</span>，库存电动车 <span>200</span>，未入库电动车 <span style="color: #D9001B;">200</span>
         </div>
 
         <el-form :inline="true" :model="listQuery" @keyup.enter.native="searchHandle()">
@@ -247,7 +247,7 @@
       </el-tab-pane>
       <el-tab-pane label="配件" name="third">
         <div class="top-info">
-          总录入配件 <span>1864</span>，已入库配件 <span>200</span>，未入库配件 <span style="color: #D9001B;">200</span>
+          总录入配件 <span>1864</span>，库存配件 <span>200</span>，未入库配件 <span style="color: #D9001B;">200</span>
         </div>
 
         <el-form :inline="true" :model="listQuery" @keyup.enter.native="searchHandle()">
@@ -392,7 +392,8 @@ export default {
         index: 1,
         length: 20,
         sn: '',
-        sort: 'id desc',
+        orderBy: 'add_time desc',
+        sort: '',
         checkStatus: null,
         recordTimeStart: '',
         recordTimeEnd: '',
@@ -405,7 +406,7 @@ export default {
       //状态选项
       statusOptins: [
         {label: '全部', value: null},
-        {label: '已入库', value: 1},
+        {label: '库存', value: 1},
         {label: '未入库', value: 2}
       ],
       //自检选项
@@ -469,8 +470,8 @@ export default {
         index: 1,
         length: 20,
         sn: '',
-        status: [1],
-        sort: 'id desc',
+        sort: '',
+        orderBy: 'add_time desc',
         checkStatus: null,
         recordTimeStart: '',
         recordTimeEnd: '',
@@ -535,7 +536,7 @@ export default {
   filters: {
     statusStr(value) {
       if(value === 1) {
-        return '已入库'
+        return '库存'
       } else if(value === 2) {
         return '已调拨'
       } else if(value === 3) {

src/views/device/storage/warehousing.vue

@@ -5,7 +5,25 @@
 			共计电池 <span>{{totalData}}</span>，未入库电池 <span>200</span>批次号: 录入时间:
 		</div> -->
 		<el-form :inline="true" :model="listQuery" @keyup.enter.native="handleFilter()">
-			<el-row style="float: right;">
+      <el-row>
+				<el-form-item label="设备SN">
+					<el-input v-model="listQuery.sn" placeholder="请输入设备SN" clearable></el-input>
+				</el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="listQuery.status">
+            <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <div style="float: right;">
+          <el-form-item>
+            <el-button type="primary" @click="searchHandle()">搜索</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="resetForm()">重置</el-button>
+          </el-form-item>
+        </div>
+			</el-row>
+			<el-row>
 				<el-form-item>
 					<el-button type="primary" @click="cerateHandle()">确认入库</el-button>
 				</el-form-item>
@@ -113,13 +131,24 @@ export default {
         title: undefined,
         type: undefined,
         sort: '+id',
-        batchNum: '',
+        status: null,
+        sn: null,
+        batchNum: null
       },
+      statusOptions: [
+				{label: '全部', value: null},
+				{label: '已录入', value: 0},
+				{label: '库存', value: 1},
+				{label: '已调拨', value: 2},
+				{label: '已出库', value: 3},
+				{label: '已处置', value: 4},
+				{label: '已调回', value: 5}
+			],
 			/**批量选中的数据列表 */
 			multipleSelection: [],
       //总电池数量
       totalData: 0,
-      //已入库电池
+      //库存电池
       storage: 0
     }
   },
@@ -167,6 +196,27 @@ export default {
       this.getDataList()
     },
 
+    //重置
+		resetForm() {
+			this.listQuery = {
+        index: 1,
+        length: 20,
+        importance: undefined,
+        title: undefined,
+        type: undefined,
+        sort: '+id',
+        status: null,
+        sn: null,
+        batchNum: this.listQuery.batchNum
+      }
+			this.getDataList()
+		},
+		//搜索
+    searchHandle() {
+      this.listQuery.index = 1
+      this.getDataList()
+    },
+
 		/**批量选择表格数据 */
 		handleSelectionChange(val) {
 			this.multipleSelection = val

src/views/device/workbench/details.vue

@@ -146,7 +146,6 @@
 <script>
 import { workDetail } from '@/api/device/workbench'
 export default {
-	name: 'WorkbenchDetails',
   data () {
     return {
       reverse: true,
@@ -249,7 +248,7 @@ export default {
 				if(value === 0) {
 					return '已录入'
 				} else if(value === 1) {
-					return '已入库'
+					return '库存'
 				} else if(value === 2) {
 					return '已调拨'
 				} else if(value === 3) {

src/views/device/workbench/index.vue

@@ -166,7 +166,7 @@ export default {
         importance: undefined,
         sn: '',
         type: null,
-        sort: '',
+        sort: 'addTime desc',
 				status: null
       },
 			total: 3,
@@ -180,7 +180,7 @@ export default {
 			statusOptions: [
 				{label: '全部', value: null},
 				{label: '已录入', value: 0},
-				{label: '已入库', value: 1},
+				{label: '库存', value: 1},
 				{label: '已调拨', value: 2},
 				{label: '已出库', value: 3},
 				{label: '已处置', value: 4},
@@ -240,7 +240,7 @@ export default {
         importance: undefined,
         sn: '',
         type: null,
-        sort: '',
+        sort: 'addTime desc',
 				status: null
       }
 			this.getDataList()