出入库管理 入库 设备校验

src/api/archivesManage/outInStorage.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+import qs from 'qs'
+
+// // 拆盒
+// export function unpacking(data) {
+//   return request({
+//     url: 'api/case/unpacking',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// // 盒详情
+// export function findInCase(params) {
+//   return request({
+//     url: 'api/case/findInCase' + '?' + qs.stringify(params, { indices: false }),
+//     method: 'get'
+//   })
+// }
+// 入库 初始化档案盒装盒信息
+export function initCaseByArchives(params) {
+  return request({
+    url: 'api/storage/initCaseByArchives' + '?' + qs.stringify(params, { indices: false }),
+    method: 'get'
+  })
+}
+export default { initCaseByArchives }

src/views/archivesManage/outInStorage/inStorage/index.vue

@@ -31,9 +31,10 @@
     <!--表格渲染-->
     <el-table
       ref="table"
+      v-loading="crud.loading"
       style="width: 100%"
       height="calc(100vh - 357px)"
-      :data="tableData"
+      :data="crud.data"
       :cell-class-name="cell"
       @row-click="clickRowHandler"
       @row-dblclick="handleDbClick"
@@ -41,25 +42,34 @@
     >
       <el-table-column type="selection" width="55" />
       <el-table-column type="index" label="序号" align="center" width="80" />
-      <el-table-column prop="inState" align="center" label="入库" min-width="80">
+      <el-table-column prop="storageType" align="center" label="入库" min-width="80">
         <template slot-scope="scope">
           <!-- 未入 / 待入 -->
-          <span class="clear" style="width:56px">{{ scope.row.inState }}</span>
+          <span v-if="scope.row.storageType===0" class="clear" style="width:56px">未入</span>
+          <span v-if="scope.row.storageType===1" class="clear" style="width:56px">未入</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="depositNum" align="center" label="已装" min-width="80" />
+      <el-table-column prop="caseName" align="center" label="盒名称" min-width="150" />
+      <el-table-column prop="tid" align="center" label="TID" min-width="250" />
+      <el-table-column prop="barcode" align="center" label="条形码" width="200" />
+      <el-table-column prop="folderLocation" align="center" label="存放位置" width="250">
+        <!-- <template slot-scope="scope">
+          <div>{{ scope.row.update_time | parseTime }}</div>
+        </template> -->
+      </el-table-column>
+      <el-table-column align="center" prop="update_time" label="操作时间" width="200">
+        <template slot-scope="scope">
+          <div>{{ scope.row.update_time | parseTime }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="havePutIn" align="center" label="已装" min-width="80" />
-      <el-table-column prop="fieldName" align="center" label="盒名称" min-width="150" />
-      <el-table-column prop="TID" align="center" label="TID" min-width="250" />
-      <el-table-column prop="barCode" align="center" label="条形码" width="200" />
-      <el-table-column prop="storagePath" align="center" label="存放位置" width="250" />
-      <el-table-column align="center" prop="operationTime" label="操作时间" width="200" />
     </el-table>
     <!-- 分页 -->
     <pagination />
     <!-- 档案盒详情 -->
     <fieldDetail ref="archiveDetailDom" />
     <!-- 入库对话框 -->
-    <inDialog ref="inDialogDom" :child="child" />
+    <inDialog ref="inDialogDom" />
     <!-- 待入库状态下提示框 -->
     <el-dialog title="提示" :visible.sync="msgVisible">
       <span class="dialog-right-top" />
@@ -94,14 +104,14 @@ import CRUD, { presenter, crud } from '@crud/crud'
 import pagination from '@crud/Pagination'
 import fieldDetail from './module/fieldDetail.vue'
 import inDialog from './module/inDialog.vue'
-import data1 from './data1.json'
+import { initCaseByArchives } from '@/api/archivesManage/outInStorage'
 export default {
   name: 'InStorage',
   components: { rrOperation, pagination, fieldDetail, inDialog },
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({
-      url: 'api/case/initCaseList',
+      url: 'api/storage/readyInto',
       // crudMethod: caseCrudMethod,
       title: '档案盒',
       optShow: {}
@@ -129,13 +139,15 @@ export default {
   },
   methods: {
     getData() {
-      this.tableData = data1.rows
+      // this.tableData = this.crud.data
+      // console.log(this.tableData)
+      console.log(this.crud, '---------crud')
     },
     // 单元格样式
     cell({ row, columnIndex }) {
-      if (row.inState === '未入' && columnIndex === 2) {
+      if (row.storageType === 0 && columnIndex === 2) {
         return 'fail-clear'
-      } else if (row.inState === '待入' && columnIndex === 2) {
+      } else if (row.storageType === 1 && columnIndex === 2) {
         return 'no-clear'
       }
     },
@@ -154,15 +166,21 @@ export default {
     },
     // 入库
     handleIn() {
-      if (this.selections.length > 0) {
-        if (this.selections[0].inState === '待入') {
-          this.msgVisible = true
-        } else {
-          // this.$refs.inDialogDom.child = this.selections[0].child
-          this.child = this.selections[0].child
-          console.log(this.child, '----------')
-          this.$refs.inDialogDom.dialogVisible = true
+      // console.log(this.selections, 'sel')
+      if (this.selections[0].storageType === 0) {
+        // this.child = this.selections[0].child
+        // console.log(this.selections[0].id, '----------')
+        const params = {
+          caseId: this.selections[0].id
+          // caseId: '8A686B1E9F255DCBE6B262'
         }
+        initCaseByArchives(params).then(res => {
+          console.log(res, 'res')
+          this.$refs.inDialogDom.childData = res
+        })
+        this.$refs.inDialogDom.dialogVisible = true
+      } else {
+        this.msgVisible = true
       }
     },
     // 人工确认

src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue

@@ -16,11 +16,11 @@
           </div>
           <!-- 右侧 -->
           <div class="content-right">
-            <!-- <button @click="test">测试</button> -->
+            <button @click="test">测试</button>
             <!-- 密集架 -->
             <ul v-show="cnName==='密集架'">
               <li v-for="(eItem) in childData" :key="eItem.id" class="box">
-                <p class="case-name">盒名称：{{ eItem.fieldName }}</p>
+                <p class="case-name">盒名称：{{ eItem.caseName }}</p>
                 <div class="frame-content head-container">
                   <div class="frame-item">
                     <span>区号</span>
@@ -64,7 +64,7 @@
             <!-- 回转柜 -->
             <ul v-show="cnName==='回转柜'">
               <li v-for="(eItem) in childData" :key="eItem.id" class="box">
-                <p class="case-name">盒名称：{{ eItem.fieldName }}</p>
+                <p class="case-name">盒名称：{{ eItem.caseName }}</p>
                 <div class="frame-content head-container">
                   <div class="frame-item">
                     <span>柜号</span>
@@ -107,18 +107,18 @@
 
 <script>
 export default {
-  props: {
-    child: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    }
-  },
+  // props: {
+  //   child: {
+  //     type: Array,
+  //     default: function() {
+  //       return []
+  //     }
+  //   }
+  // },
   data() {
     return {
       dialogVisible: false,
-      childData: this.child,
+      childData: [],
       cnName: '',
       defaultProps: { children: 'children', label: 'cnName' },
       treeData: [{
@@ -144,11 +144,11 @@ export default {
     // 密集架
 
   },
-  watch: {
-    child(newVal, oldVal) {
-      this.childData = newVal
-    }
-  },
+  // watch: {
+  //   child(newVal, oldVal) {
+  //     this.childData = newVal
+  //   }
+  // },
   methods: {
     // 选中设备
     handleNodeClick(data) {