From 06bb6c99822678ba0f7a4d076336ffa06e451128 Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Wed, 13 Jul 2022 13:22:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outInStorage/inStorage/data1.json         |  67 +++++-----
 .../outInStorage/inStorage/index.vue          |  17 ++-
 .../inStorage/module/inDialog.vue             | 118 +++++++++---------
 3 files changed, 100 insertions(+), 102 deletions(-)

diff --git a/src/views/archivesManage/outInStorage/inStorage/data1.json b/src/views/archivesManage/outInStorage/inStorage/data1.json
index 229f495..c1f20e8 100644
--- a/src/views/archivesManage/outInStorage/inStorage/data1.json
+++ b/src/views/archivesManage/outInStorage/inStorage/data1.json
@@ -14,15 +14,15 @@
           "operationTime":"2022-5-25  08:40",
           "childrenNum":11,
           "child":[
-            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"1","sectionNum":"1","levelNum":"1","direction":"左边"},
-            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"1","sectionNum":"1","levelNum":"1","direction":"左边"},
-            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"1","sectionNum":"1","levelNum":"1","direction":"左边"}
+            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
           ]
       },
       {
           "id":"3d6d548d30db426ea3d95d63f589b294",
           "checkNum":"PD-202205250840",
-          "containPath":"未入",
+          "inState":"未入",
           "havePutIn":"0",
           "fieldName":"文书-文件-2022",
           "TID":"E2806894200040159AF8AD06",
@@ -30,7 +30,12 @@
           "storagePath":"库房A-库区A-01列-1节1层-左",
           "misplaceNum":"20",
           "operationTime":"2022-5-25  08:41",
-          "childrenNum":11
+          "childrenNum":11,
+          "child":[
+            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
+          ]
       },
       {
           "id":"45ff597e7cc64d11803ac422816b1e23",
@@ -43,7 +48,12 @@
           "storagePath":"库房A-库区A-01列-1节1层-左",
           "misplaceNum":"20",
           "operationTime":"2022-5-25  08:42",
-          "childrenNum":11
+          "childrenNum":11,
+          "child":[
+            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
+          ]
       },
       {
           "id":"49106aa0d1534a7a900843d0c4531840",
@@ -56,7 +66,12 @@
           "storagePath":"库房A-库区A-01列-1节1层-左",
           "misplaceNum":"20",
           "operationTime":"2022-5-25  08:50",
-          "childrenNum":11
+          "childrenNum":11,
+          "child":[
+            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
+          ]
       },
       {
           "id":"6e604355ff1e47e8b48117dca36420c7",
@@ -69,7 +84,12 @@
           "storagePath":"库房A-库区A-01列-1节1层-左",
           "misplaceNum":"20",
           "operationTime":"2022-5-25  08:40",
-          "childrenNum":11
+          "childrenNum":11,
+          "child":[
+            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
+          ]
       },
       {
           "id":"6f4a6631d9d3424b960793704f3757b3",
@@ -82,32 +102,13 @@
           "storagePath":"库房A-库区A-01列-1节1层-左",
           "misplaceNum":"20",
           "operationTime":"2022-5-25  08:40",
-          "childrenNum":11
+          "childrenNum":11,
+          "child":[
+            {"id":"0","fieldName":"文书-文件-2022","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"1","fieldName":"文书-文件-2021","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""},
+            {"id":"2","fieldName":"文书-文件-2020","fieldNum":"1","colNum":"","sectionNum":"","levelNum":"","direction":"","cabinetNum":"1","cabLevel":"","cabCol":""}
+          ]
 
-      },
-      {
-          "id":"76e29d5c0a0541bfb1ee9da432183b15",
-          "checkNum":"PD-202205250842",
-          "inState":"待入",
-          "havePutIn":"0",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:40"
-      },
-      {
-          "id":"a0ffdd94161146c49161662c3f9a70cd",
-          "checkNum":"PD-202205250842",
-          "inState":"未入",
-          "havePutIn":"0",
-          "fieldName":"文书-文件-2022",
-          "TID":"E2806894200040159AF8AD06",
-          "barCode":"|||||||||||||||||||||||||",
-          "storagePath":"库房A-库区A-01列-1节1层-左",
-          "misplaceNum":"20",
-          "operationTime":"2022-5-25  08:40"
       }
   ],
   "footer":null,
diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index c5afe8e..3bbb3b7 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -59,7 +59,7 @@
     <!-- 档案盒详情 -->
     <fieldDetail ref="archiveDetailDom" />
     <!-- 入库对话框 -->
-    <inDialog ref="inDialogDom" />
+    <inDialog ref="inDialogDom" :child="child" />
     <!-- 待入库状态下提示框 -->
     <el-dialog title="提示" :visible.sync="msgVisible">
       <span class="dialog-right-top" />
@@ -74,7 +74,7 @@
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <p>入库成功</p>
-        <p style="color:#f00;margin:10px 0">提示：如果当前设备不在线或者未勾选联动操作，请人工完成上架操作</p>
+        <p style="color:#f00;margin:10px 0;display:block">提示：如果当前设备不在线或者未勾选联动操作，请人工完成上架操作</p>
       </div>
     </el-dialog>
     <!-- 人工确认失败提示 -->
@@ -120,7 +120,8 @@ export default {
         { value: '选项5', label: '盒名称' },
         { value: '选项6', label: '条形码' },
         { value: '选项7', label: 'TID' }
-      ]
+      ],
+      child: []
     }
   },
   created() {
@@ -157,15 +158,11 @@ export default {
         if (this.selections[0].inState === '待入') {
           this.msgVisible = true
         } else {
-          this.$refs.inDialogDom.child = this.selections[0].child
-          console.log(this.$refs.inDialogDom.child, '----------')
+          // this.$refs.inDialogDom.child = this.selections[0].child
+          this.child = this.selections[0].child
+          console.log(this.child, '----------')
           this.$refs.inDialogDom.dialogVisible = true
         }
-      } else {
-        this.$message({
-          message: '请选择档案',
-          type: 'warning'
-        })
       }
     },
     // 人工确认
diff --git a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
index 07735dd..0fe3c42 100644
--- a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
@@ -16,36 +16,37 @@
           </div>
           <!-- 右侧 -->
           <div class="content-right">
+            <!-- <button @click="test">测试</button> -->
             <!-- 密集架 -->
-            <ul>
-              <li v-for="eItem in child" v-show="cnName==='密集架'" :key="eItem.id" class="box">
+            <ul v-show="cnName==='密集架'">
+              <li v-for="(eItem) in childData" :key="eItem.id" class="box">
                 <p class="case-name">盒名称：{{ eItem.fieldName }}</p>
                 <div class="frame-content head-container">
                   <div class="frame-item">
                     <span>区号</span>
-                    <el-input v-model="fieldNum" type="number" class="filter-item" />
+                    <el-input v-model="eItem.fieldNum" disabled type="number" class="filter-item" />
                   </div>
                   <div class="frame-item item-line">
                     <span>列</span>
-                    <el-select v-model="colVal" class="filter-item" style="width: 86px;">
-                      <el-option v-for="item in colOptions" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-select v-model="eItem.colNum" class="filter-item" style="width: 86px;">
+                      <el-option v-for="item in numOptions" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </div>
                   <div class="frame-item item-line">
                     <span>节</span>
-                    <el-select v-model="sectionVal" class="filter-item" style="width: 86px;">
-                      <el-option v-for="item in sectionOptions" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-select v-model="eItem.sectionNum" class="filter-item" style="width: 86px;">
+                      <el-option v-for="item in numOptions" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </div>
                   <div class="frame-item item-line">
                     <span>层</span>
-                    <el-select v-model="levelVal" class="filter-item" style="width: 86px;">
-                      <el-option v-for="item in levelOptions" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-select v-model="eItem.levelNum" class="filter-item" style="width: 86px;">
+                      <el-option v-for="item in numOptions" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </div>
                   <div class="frame-item item-line">
                     <span>方向</span>
-                    <el-select v-model="directionVal" class="filter-item" style="width: 86px;">
+                    <el-select v-model="eItem.direction" class="filter-item" style="width: 86px;">
                       <el-option v-for="item in directionOptions" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </div>
@@ -56,31 +57,32 @@
                 </div>
                 <p class="success-msg">
                   <span class="el-icon-success" />
-                  <span class="success-text">位置已核对成功,层位名称：{{ fieldNum }}区{{ colVal }}列{{ sectionVal }}节{{ levelVal }}层{{ directionVal }}</span>
+                  <span class="success-text">位置已核对成功,层位名称：{{ eItem.fieldNum }}区{{ eItem.colNum }}列{{ eItem.sectionNum }}节{{ eItem.levelNum }}层{{ eItem.direction }}</span>
                 </p>
               </li>
             </ul>
             <!-- 回转柜 -->
-            <ul>
-              <li v-show="cnName==='回转柜'" class="box">
+            <ul v-show="cnName==='回转柜'">
+              <li v-for="(eItem) in childData" :key="eItem.id" class="box">
+                <p class="case-name">盒名称：{{ eItem.fieldName }}</p>
                 <div class="frame-content head-container">
                   <div class="frame-item">
                     <span>柜号</span>
-                    <el-input v-model="cabinetNum" type="number" class="filter-item" />
+                    <el-input v-model="eItem.cabinetNum" disabled type="number" class="filter-item" />
                   </div>
                   <div class="frame-item item-line">
                     <span>层</span>
-                    <el-select v-model="cabLevel" class="filter-item" style="width: 86px;">
-                      <el-option v-for="item in cabLevelOptions" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-select v-model="eItem.cabLevel" class="filter-item" style="width: 86px;">
+                      <el-option v-for="item in numOptions" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </div>
                   <div class="frame-item item-line">
                     <span>列</span>
-                    <el-select v-model="cabCol" class="filter-item" style="width: 86px;">
-                      <el-option v-for="item in cabColOptions" :key="item.value" :label="item.label" :value="item.value" />
+                    <el-select v-model="eItem.cabCol" class="filter-item" style="width: 86px;">
+                      <el-option v-for="item in numOptions" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </div>
-                  <div class="state-btn" style="padding-right:32px;margin-bottom:30px">
+                  <div class="state-btn" style="padding-right:32px;margin-bottom:14px">
                     <el-button v-show="true" type="primary" class="el-icon-refresh icon-style" />
                     <el-button v-show="false" type="success" style="background:#1AAF91;border:none" class="el-icon-check icon-style" />
                     <el-button v-show="false" type="success" style="background:#F65163;border:none" class="el-icon-close icon-style" />
@@ -88,7 +90,7 @@
                 </div>
                 <p class="success-msg">
                   <span class="el-icon-success" />
-                  <span class="success-text">位置已核对成功,层位名称：{{ cabinetNum }}柜{{ colVal }}层{{ sectionVal }}列</span>
+                  <span class="success-text">位置已核对成功,层位名称：{{ eItem.cabinetNum }}柜{{ eItem.cabLevel }}层{{ eItem.cabCol }}列</span>
                 </p>
               </li>
             </ul>
@@ -105,10 +107,18 @@
 
 <script>
 export default {
+  props: {
+    child: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    }
+  },
   data() {
     return {
       dialogVisible: false,
-      child: [],
+      childData: this.child,
       cnName: '',
       defaultProps: { children: 'children', label: 'cnName' },
       treeData: [{
@@ -119,51 +129,36 @@ export default {
         ]
       }],
       // 密集架
-      fieldNum: 1,
-      fieldOptions: [
-        { value: '选项1', label: '1' },
-        { value: '选项2', label: '2' }
-      ],
-      colVal: null,
-      colOptions: [
-        { value: '选项1', label: '1' },
-        { value: '选项2', label: '2' }
-      ],
-      sectionVal: null,
-      sectionOptions: [
-        { value: '选项1', label: '1' },
-        { value: '选项2', label: '2' }
+      numOptions: [
+        { value: '1', label: '1' },
+        { value: '2', label: '2' }
       ],
-      levelVal: null,
-      levelOptions: [
-        { value: '选项1', label: '1' },
-        { value: '选项2', label: '2' }
-      ],
-      directionVal: '',
       directionOptions: [
-        { value: '选项1', label: '左边' },
-        { value: '选项2', label: '右边' }
-      ],
-      // 回转柜
-      cabinetNum: 1,
-      cabLevel: null,
-      cabLevelOptions: [
-        { value: '选项1', label: '1' },
-        { value: '选项2', label: '2' }
-      ],
-      cabCol: null,
-      cabColOptions: [
-        { value: '选项1', label: '1' },
-        { value: '选项2', label: '2' }
+        { value: '左边', label: '左边' },
+        { value: '右边', label: '右边' }
       ]
+      // 回转柜
+    }
+  },
+  computed: {
+    // 密集架
+
+  },
+  watch: {
+    child(newVal, oldVal) {
+      this.childData = newVal
     }
   },
   methods: {
-    // 选中设备出现相应设置
+    // 选中设备
     handleNodeClick(data) {
       this.cnName = data.cnName
+    },
+    test() {
+      console.log(this.childData, '...........')
     }
   }
+
 }
 </script>
 
@@ -195,9 +190,10 @@ export default {
 .head-container{
   padding: 0 20px;
 }
-// .box{
-//   margin-bottom: 20px;
-// }
+.box{
+  padding-bottom: 15px;
+  border-bottom: #113D72 1px dashed;
+}
 .content{
   color: #339CFF;
   height: 492px;
@@ -277,4 +273,8 @@ export default {
     margin-right: 7px;
   }
 }
+::v-deep .el-input.is-disabled .el-input__inner{
+  background-color: #021330;
+  border-color: #17426b;
+}
 </style>