自检

src/api/device/handle.js

@@ -16,4 +16,13 @@ export function addHandle(data) {
         method: 'post',
         data
     })
+}
+
+//处置查看详情
+export function handleDetail(data) {
+    return request({
+        url: '/api/v1/app/device/log/handle/pageQuery/Detail',
+        method: 'post',
+        data
+    })
 }

src/views/device/allocation/details.vue

@@ -72,7 +72,7 @@
 
       <el-table-column align="center" label="入库时间">
         <template slot-scope="scope">
-          <span>{{ scope.row.instorage_time || '-' }}</span>
+          <span>{{ scope.row.instorageTime || '-' }}</span>
         </template>
       </el-table-column>
     </el-table>

src/views/device/allocation/index.vue

@@ -518,15 +518,17 @@ export default {
       }
     },
     TFUserdStr(value) {
-      let arr = value.split(',')
-      if(arr.length === 1) {
-        if(arr[0] === '1') {
-          return '智慧运营'
-        } else if(arr[0] === '2') {
-          return '智慧运维'
+      if(value) {
+        let arr = value.split(',')
+        if(arr.length === 1) {
+          if(arr[0] === '1') {
+            return '智慧运营'
+          } else if(arr[0] === '2') {
+            return '智慧运维'
+          }
+        } else if(arr.length > 1) {
+          return '智慧运营,智慧运维'
         }
-      } else if(arr.length > 1) {
-        return '智慧运营,智慧运维'
       } else {
         return '-'
       }

src/views/device/delivery/batchOut.vue

@@ -73,7 +73,7 @@
 
       <el-table-column label="入库时间">
         <template slot-scope="scope">
-          {{ scope.row.into || '-' }}
+          {{ scope.row.instorageTime || '-' }}
         </template>
       </el-table-column>
 
@@ -190,8 +190,12 @@ export default {
 		},
 
 		//多选
-		checkSelectable() {
-			
+		checkSelectable(row) {
+			if (row.transfer > 0) {
+        return true
+      } else {
+        return false
+      }
 		},
     gotoDetail(batchId) {
       this.$router.push({

src/views/device/handle/handle-add.vue

@@ -79,6 +79,7 @@ export default {
 
     inputHandle() {
       let sn = this.dataForm.snstr
+      this.dataForm.sn = []
       this.dataForm.sn.push(sn)
     },
     // 表单提交

src/views/device/handle/handle-info.vue

@@ -1,121 +1,67 @@
 <template>
   <el-dialog :visible.sync="visible" :title="title" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="'120px'">
-			<el-form-item label="设备SN" prop="sn">
-				<el-input :maxlength="20" style="width: 400px;" show-word-limit v-model="dataForm.sn" placeholder="请输入设备SN或IMEI"></el-input>
-			</el-form-item>
-      <el-form-item label="处置类型" prop="eventType">
-				<el-select v-model="dataForm.eventType" style="width: 400px;">
-          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
-        </el-select>
-			</el-form-item>
-      <el-form-item label="设备新SN" prop="newsn" v-if="dataForm.eventType === 1">
-				<el-input :maxlength="20" style="width: 400px;" show-word-limit v-model="dataForm.newsn" placeholder="请输入设备新的SN"></el-input>
-			</el-form-item>
-      <el-form-item label="处置说明" prop="remarks">
-				<el-input :maxlength="200" style="width: 400px;" type="textarea" show-word-limit v-model="dataForm.remarks" placeholder="请输入处置说明"></el-input>
-			</el-form-item>
-    </el-form>
-    <template slot="footer">
-			<el-button type="primary" @click="dataFormSubmitHandle()">确认</el-button>
-      <el-button @click="visible = false">取消</el-button>
-    </template>
+    <el-table
+      v-loading="loading"
+      :data="detail"
+      element-loading-text="Loading"
+      :cell-style="{'text-align':'center'}"
+      fit
+      highlight-current-row
+    >
+      <el-table-column>
+        <template slot-scope="scope">
+          {{ scope.row.sn || '-' }}
+        </template>
+      </el-table-column>
+
+      <el-table-column>
+        <template slot-scope="scope">
+          {{ scope.row.handleTime || '-' }}
+        </template>
+      </el-table-column>
+    </el-table>
   </el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
-import { addHandle } from '@/api/device/handle'
+import { handleDetail } from '@/api/device/handle'
 export default {
   data () {
     return {
 			/**是否显示弹窗 */
       visible: false,
 			/**弹窗标题 */
-			title: '新增处置',
-      //处置类型
-      options: [
-        {label: '报废', value: 1},
-        {label: '丢失', value: 2},
-        {label: '更换', value: 3},
-        {label: '梯次退役', value: 4}
-      ],
+			title: '历史SN查看',
+      
 			/**提交表单对象 */
       dataForm: {
-        id: '',
-				remarks: '',
 				sn: '',
-        eventType: null,
-        newsn: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-				sn: [
-					{ required: true, message: '设备SN不能为空', trigger: 'blur' },
-				],
-				remarks: [
-					{ required: true, message: '处置说明不能为空', trigger: 'blur' },
-				],
-        newsn: [
-					{ required: true, message: '设备新SN不能为空', trigger: 'blur' },
-				],
-        eventType: [
-					{ required: true, message: '处置类型不能为空', trigger: 'change' },
-				]
-      }
+      },
+      detail: [],
+      loading: false
     }
   },
   methods: {
     init () {
       this.visible = true
       this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields()
+				// this.$refs['dataForm'].resetFields()
       })
+      this.getInfo()
     },
     // 获取信息
     getInfo () {
-      this.$http.get('/tbCollectManagment/tbcollectmanagment/' + this.dataForm.id).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
+      handleDetail(this.dataForm).then(res => {
+        this.loading = true
+        if(res.code === 200) {
+          this.detail = res.data
+          this.loading = false
+        } else {
+          return this.$message.error(res.message)
         }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$confirm('确认后无法撤回，请谨慎操作, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          addHandle(this.dataForm).then(res => {
-            debugger
-            if (res.code !== 200) {
-              return this.$message.error(res.msg)
-            }
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1000,
-              onClose: () => {
-                this.visible = false
-                this.$emit('refreshDataList')
-              }
-            })
-          }).catch(() => {})
-        })
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    },
   }
 }
 </script>

src/views/device/handle/index.vue

@@ -51,13 +51,13 @@
 
           <el-table-column label="处置产品" prop="plateNumber">
             <template slot-scope="scope">
-              {{ scope.row.code || '-' }}
+              {{ scope.row.code || '电池' }}
             </template>
           </el-table-column>
 
           <el-table-column label="处置类型" prop="deptId">
             <template slot-scope="scope">
-              {{ scope.row.eventType || '-'}}
+              {{ scope.row.handleType | handleTypeStr}}
             </template>
           </el-table-column>
 
@@ -81,7 +81,7 @@
 
           <el-table-column align="center" label="历史SN" width="120">
             <template slot-scope="scope">
-              <el-button @click="infoHandle(scope.row.id)" type="text">查看</el-button>
+              <el-button @click="infoHandle(scope.row.sn)" type="text">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -259,7 +259,7 @@
 
           <el-table-column align="center" label="历史SN" width="120">
             <template slot-scope="scope">
-              <el-button @click="infoHandle(scope.row.id)" type="text">查看</el-button>
+              <el-button @click="infoHandle(scope.row.sn)" type="text">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -378,8 +378,29 @@ export default {
 			});
 		},
     //打开查看弹窗
-    infoHandle() {
+    infoHandle(sn) {
       this.infoVisiable = true
+      this.$nextTick(() => {
+				this.$refs.info.init()
+        this.$refs.info.dataForm.sn = sn
+			});
+    }
+  },
+  filters: {
+    handleTypeStr(value) {
+      if (value) {
+        if(value === 1) {
+          return '报废'
+        } else if(value === 2) {
+          return '丢失'
+        } else if(value === 3) {
+          return '更换'
+        } else if(value === 4) {
+          return '梯次退役'
+        }
+      } else {
+        return '-'
+      }
     }
   }
 }

src/views/device/storage/checkModal.vue

@@ -0,0 +1,29 @@
+<template>
+  <el-dialog :visible.sync="visible" title="自检结果查看" :close-on-click-modal="false" :close-on-press-escape="false">
+    <div style="color: #01DF01; text-align: center;" v-if="type === 1">{{dataForm.sn + '    自检通过'}}</div>
+    <div style="color: #DF0101; text-align: center;" v-if="type === 2">{{dataForm.sn + '     自检不通过'}}</div>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import { addStorageIn } from '@/api/device/storage'
+export default {
+  data () {
+    return {
+      //是否显示弹窗
+      visible: false,
+      //表单对象
+      dataForm: {
+        sn: '',
+      },
+      type: null
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+    },
+  }
+}
+</script>

src/views/device/storage/index.vue

@@ -113,8 +113,8 @@
 
           <el-table-column align="center" label="操作" width="180">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.checkStatus === 1" @click="edit(scope.row.id)" type="text">已通过</el-button>
-              <el-button v-if="scope.row.checkStatus === 0" @click="edit(scope.row.id)" type="text">未通过</el-button>
+              <el-button v-if="scope.row.check_status === 1" @click="checked(scope.row.sn, 1)" type="text">已通过</el-button>
+              <el-button v-if="scope.row.check_status === 0" @click="checked(scope.row.sn, 2)" type="text">未通过</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -355,8 +355,8 @@
 
           <el-table-column align="center" label="操作" width="180">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.checkStatus === 1" @click="edit(scope.row.id)" type="text">已通过</el-button>
-              <el-button v-if="scope.row.checkStatus === 0" @click="edit(scope.row.id)" type="text">未通过</el-button>
+              <el-button v-if="scope.row.check_status === 1" @click="edit(scope.row.id)" type="text">已通过</el-button>
+              <el-button v-if="scope.row.check_status === 0" @click="edit(scope.row.id)" type="text">未通过</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -368,6 +368,7 @@
       </el-tab-pane>
     </el-tabs>  
 		<Create v-if="addVisible" ref="create" @refreshDataList="getDataList"></Create>
+    <Check v-if="checkVisible" ref="check" @refreshDataList="getDataList"></Check>
   </div>
 </template>
 
@@ -375,9 +376,10 @@
 import { storageInList } from '@/api/device/storage'
 import { dataTotle } from '@/api/device/info'
 import Create from '@/views/device/storage/create.vue'
+import Check from '@/views/device/storage/checkModal.vue'
 
 export default {
-  components: { Create },
+  components: { Create, Check },
   data() {
     return {
       //列表加载动画
@@ -413,6 +415,7 @@ export default {
       ],
       activeName: 'first',
       dataTotle: {},
+      checkVisible: false,
     }
   },
   created() {
@@ -511,6 +514,15 @@ export default {
     /**跳转批次入库页面 */
     gotoHandle() {
       this.$router.push('/device/storage/batchWarehousing')
+    },
+    checked(sn, type) {
+      this.checkVisible = true
+      this.$nextTick(() => {
+				this.$refs.check.init()
+        this.$refs.check.dataForm.sn = sn
+        this.$refs.check.type = type
+			});
+      
     }
   },
   filters: {