界面调整

src/views/device/allocation/allocationBack.vue

@@ -13,11 +13,6 @@
 					<el-button @click="resetForm()">重置</el-button>
 				</el-form-item>
 			</div>
-			<el-row>
-				<el-form-item>
-					<el-button type="primary" @click="transferHandle()">回调</el-button>
-				</el-form-item>
-			</el-row>
 		</el-form>
 
     <el-table
@@ -58,13 +53,13 @@
           {{ scope.row.into }}
         </template>
       </el-table-column>
-    </el-table>
 
-    <el-table-column align="center" label="操作" width="180">
-      <template slot-scope="scope">
-        <el-button @click="transferHandle(scope.row)" type="text">回调</el-button>
-      </template>
-    </el-table-column>
+      <el-table-column align="center" label="操作" width="180">
+        <template slot-scope="scope">
+          <el-button @click="transferHandle(scope.row)" type="text">回调</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
 		<el-pagination style="float: right; margin-top: 30px;" :current-page="listQuery.index" :page-sizes="[10, 20, 50, 100]" :page-size="listQuery.length" :total="total"
 			layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@@ -115,6 +110,19 @@ export default {
       this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)
     },
+    //重置
+    resetForm() {
+      this.listQuery = {
+        index: 1,
+        length: 20,				
+        importance: undefined,
+        sn: '',
+        type: undefined,
+        sort: '',
+        status: [3]
+      }
+      this.getDataList()
+    },
     //搜索
     searchHandle() {
       this.listQuery.index = 1
@@ -152,6 +160,9 @@ export default {
 			this.$nextTick(() => {
 				this.$refs.back.init()
         this.$refs.back.dataForm.sn = [row.sn]
+        this.$refs.back.pack = row.packTitle
+        this.$refs.back.typeTitle = row.typeTitle
+        this.$refs.back.updateTime = row.updateTime
 			});
 		}
   }

src/views/device/allocation/back-modal.vue

@@ -4,43 +4,43 @@
 			<el-row>
 				<el-col :span="12">
 					<el-form-item label="设备SN">
-						<span>MCLCLL640S2131001</span>
+						<span>{{dataForm.sn[0]}}</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="厂家">
-						<span>格林美</span>
+						<span>{{pack}}</span>
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="12">
 					<el-form-item label="型号">
-						<span>磷酸铁锂6060</span>
+						<span>--</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="类型">
-						<span>二轮车</span>
+						<span>{{typeTitle}}</span>
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="12">
 					<el-form-item label="设备类型">
-						<span>动力电池</span>
+						<span>--</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="设备用途	">
-						<span>智慧运营 、智能运维</span>
+						<span>--</span>
 					</el-form-item>
 				</el-col>
 			</el-row>
 			<el-row>
 				<el-col :span="12">
 					<el-form-item label="设备说明">
-						<span>运营设备</span>
+						<span>--</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
@@ -52,12 +52,12 @@
 			<el-row>
 				<el-col :span="12">
 					<el-form-item label="调拨日期	">
-						<span>日期</span>
+						<span>--</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="出库日期	">
-						<span>日期</span>
+						<span>{{updateTime}}</span>
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -80,7 +80,7 @@
 <script>
 import debounce from 'lodash/debounce'
 import { isCn, isCapitalization, isNumber } from '@/utils/validate'
-import { transfer } from '@/api/device/delivery'
+import { transfer } from '@/api/device/allocation'
 export default {
   data () {
     return {
@@ -103,7 +103,13 @@ export default {
       option: [
         {label: '退还', value : 1},
         {label: '故障', value : 2}
-      ]
+      ],
+			//厂家
+			pack: '',
+			//类型
+			typeTitle: '',
+			//调拨时间
+			updateTime: '',
     }
   },
   computed: {

src/views/device/allocation/index.vue

@@ -13,7 +13,7 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="5">
-					<el-form-item label="出库类型">
+					<el-form-item label="调拨类型">
 						<el-select v-model="listQuery.type">
               <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
             </el-select> 

src/views/device/delivery/batchOut.vue

@@ -112,7 +112,7 @@ export default {
         length: 20,
         sn: '',
         type: null,
-        sort: '+id',
+        sort: '',
       },
 			/**是否显示新增弹窗 */
 			addVisible: false,
@@ -135,6 +135,18 @@ export default {
       this.getDataList()
     },
 
+    //重置
+    resetForm() {
+      this.listQuery = {
+        index: 1,
+        length: 20,
+        sn: '',
+        type: null,
+        sort: '',
+      }
+      this.getDataList()
+    },
+
     //获取列表数据
     getDataList() {
       this.loading = true

src/views/device/delivery/details.vue

@@ -130,6 +130,19 @@ export default {
       this.getDataList()
     },
 
+    //重置
+    resetForm() {
+      this.listQuery = {
+        index: 1,
+        length: 20,
+        sn: '',
+        type: null,
+        sort: '',
+        batchNum: ''
+      }
+      this.getDataList()
+    },
+
     //获取列表数据
     getDataList() {
       this.loading = true

src/views/device/handle/index.vue

@@ -7,12 +7,12 @@
 
 		<el-form :inline="true" :model="listQuery" @keyup.enter.native="handleFilter()">
 			<el-row>
-				<el-col :span="6">
+				<el-col :span="12">
 					<el-form-item label="设备SN">
-						<el-input v-model="listQuery.type" placeholder="请输入设备SN" clearable></el-input>
+						<el-input v-model="listQuery.sn" placeholder="请输入设备SN" clearable></el-input>
 					</el-form-item>
 				</el-col>
-				<el-col :span="6">
+				<!-- <el-col :span="6">
 					<el-form-item label="处置时间">
 						<el-input v-model="listQuery.type" placeholder="请选择" clearable></el-input>
 					</el-form-item>
@@ -21,8 +21,8 @@
 					<el-form-item label="处置类型">
 						<el-input v-model="listQuery.type" placeholder="请选择" clearable></el-input>
 					</el-form-item>
-				</el-col>
-				<el-col :span="6">
+				</el-col> -->
+				<el-col :span="12">
 					<div style="float: right;">
 						<el-form-item>
 							<el-button type="primary" @click="handleFilter()">搜索</el-button>
@@ -126,7 +126,8 @@ export default {
         importance: undefined,
         title: undefined,
         type: undefined,
-        sort: ''
+        sort: '',
+        sn: ''
       },
 			/**是否显示新增弹窗 */
 			addVisible: false,
@@ -142,6 +143,19 @@ export default {
       this.listQuery.index = 1
       this.getDataList()
     },
+    //重置
+    resetForm() {
+      this.listQuery = {
+        index: 1,
+        length: 20,
+        importance: undefined,
+        title: undefined,
+        type: undefined,
+        sort: '',
+        sn: ''
+      }
+      this.getDataList()
+    },
     //获取列表数据
     getDataList() {
       this.loading = true