diff --git a/src/api/collect/relCode.js b/src/api/collect/relCode.js
index aaa5340f..c2c365b0 100644
--- a/src/api/collect/relCode.js
+++ b/src/api/collect/relCode.js
@@ -23,7 +23,13 @@ export function addRelCode(query) {
     data: query
   });
 }
-
+export function addRelCodeSpellBox(query) {
+  return axios({
+    url: "/udiwms/relCode/batch/addRelCodeSpellBox",
+    method: "post",
+    data: query
+  });
+}
 
 export function getDetailList(query) {
   return axios({
@@ -40,4 +46,4 @@ export function scanCodeRelCode(query) {
     method: "post",
     data: query
   });
-}
\ No newline at end of file
+}
diff --git a/src/views/collect/relCode/operateRelCodeSpell.vue b/src/views/collect/relCode/operateRelCodeSpell.vue
index 8827cd9e..e3eb0885 100644
--- a/src/views/collect/relCode/operateRelCodeSpell.vue
+++ b/src/views/collect/relCode/operateRelCodeSpell.vue
@@ -13,7 +13,7 @@
               style="display: flex; margin-top: 5px; float: right"
             >
               <el-button size="mini" type="primary" @click.native="spellBox()" :loading="submitLoading"
-                        style="margin-right: 8px;border-radius: 5%;"
+                        style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailListSpell.length == 0"
               >拼箱
               </el-button>
               <el-button size="mini" type="primary" @click.native="giveUp()" :loading="submitLoading"
@@ -101,6 +101,7 @@
                   auto-complete="off"
                   style="width: 90%"
                   clearable
+                  :disabled="this.inputDisabled"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -113,6 +114,7 @@
                   clearable
                   value-format="yyyy-MM-dd HH:mm:ss"
                   style="width: 90%"
+                  :disabled="this.inputDisabled"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -126,6 +128,7 @@
                   clearable
                   value-format="yyyy-MM-dd HH:mm:ss"
                   style="width: 90%"
+                  :disabled="this.inputDisabled"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -138,6 +141,7 @@
                   clearable
                   style="width: 90%"
                   placeholder="请输入备注"
+                  :disabled="this.inputDisabled"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -236,7 +240,7 @@
 
   <script>
   import {enterCodeWeb} from "@/api/inout/order";
-  import {addRelCode,scanCodeRelCode} from "@/api/collect/relCode";
+  import {addRelCodeSpellBox,scanCodeRelCode} from "@/api/collect/relCode";
   import sonRelCode from './sonRelCodeSpell.vue';
   import A from "@/plugins/KeyScaner";
   export default {
@@ -255,6 +259,7 @@
     },
     data() {
       return {
+        inputDisabled: false,
         //扫码相关
         codeFormData: {
           code: "",
@@ -350,6 +355,7 @@
           detailList:[]
         },
         relFormDatas:[],
+        detailListSpell: [],
         popLevel:1,
       };
     },
@@ -396,6 +402,7 @@
             return;
           }
         }
+
         let tQuery = Object.assign(this.codeFormData);
         tQuery.curCode = this.codeFormData.code;
         tQuery.parentCode = this.parentCode;
@@ -469,6 +476,8 @@
                 }else if(data.packLayer == (this.relFormData.packLayer-1) ) {
                   //下级码
                   this.detailList.push(data);
+                  this.detailListSpell.push(data);
+                  this.inputDisabled = true
                   this.syxjsl = this.detailList.length;
 
                   //判断是否还有下级码 如果有进行弹窗 关联
@@ -543,15 +552,25 @@
           detailList: []
         }
         this.detailList = []
+        this.detailListSpell = []
         this.parentCode = null
         this.bhxjsl = 0
         this.syxjsl = 0
         this.packLayer = null
       },
       spellBox() {
-        this.relFormDatas.push(this.relFormData)
-        console.log("拼凑箱子详情",this.relFormDatas)
-
+        const temp = JSON.parse(JSON.stringify(this.relFormData));
+        this.detailListSpell.forEach( item =>{
+          temp.detailList.push(item)
+        });
+        this.relFormDatas.push(temp)
+        this.detailListSpell = []
+        this.relFormData.detailList = []
+        this.relFormData.batchNo = null
+        this.relFormData.madeDate = null
+        this.relFormData.validateDate = null
+        // console.log("拼凑箱子详情",this.relFormDatas)
+        this.inputDisabled = false
       },
       submit(val) {
         if(this.detailList == null || this.detailList.length == 0){
@@ -571,12 +590,6 @@
           return;
         }
 
-
-        this.$set(this.relFormData, 'detailList', []);
-        this.detailList.forEach( item =>{
-          this.relFormData.detailList.push(item)
-        });
-
         //增加数量是否完全判断
         if( this.bhxjsl != this.syxjsl){
           this.$confirm("该层级已录入数量与应录入数量不符, 是否继续提交?", "提示", {
@@ -586,7 +599,14 @@
           })
             .then(() => {
               this.loading = true;
-              addRelCode(this.relFormData).then((response) => {
+
+              const temp = JSON.parse(JSON.stringify(this.relFormData));
+              this.detailListSpell.forEach( item =>{
+                temp.detailList.push(item)
+              });
+              this.relFormDatas.push(temp)
+
+              addRelCodeSpellBox(this.relFormDatas).then((response) => {
                 this.loading = false;
                 if (response.code === 20000) {
                   this.$message.success("保存成功！");
@@ -604,7 +624,14 @@
             });
         }else {
           this.loading = true;
-          addRelCode(this.relFormData).then((response) => {
+
+          const temp = JSON.parse(JSON.stringify(this.relFormData));
+          this.detailListSpell.forEach( item =>{
+            temp.detailList.push(item)
+          });
+          this.relFormDatas.push(temp)
+
+          addRelCodeSpellBox(this.relFormDatas).then((response) => {
             this.loading = false;
             if (response.code === 20000) {
               this.$message.success("保存成功！");
@@ -743,6 +770,7 @@
         this.scanCode = "";
         this.result = "";
         this.detailList = [];
+        this.detailListSpell = []
         this.bhxjsl = 0;
         this.syxjsl = 0;
         this.parentCode = null;
diff --git a/src/views/collect/relCode/sonRelCodeSpell.vue b/src/views/collect/relCode/sonRelCodeSpell.vue
index 84a52b9f..8e62ad70 100644
--- a/src/views/collect/relCode/sonRelCodeSpell.vue
+++ b/src/views/collect/relCode/sonRelCodeSpell.vue
@@ -12,14 +12,14 @@
             <el-button-group
               style="display: flex; margin-top: 5px; float: right"
             >
+              <el-button size="mini" type="primary" @click.native="spellBox()" :loading="submitLoading"
+                         style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailListSpell.length == 0"
+              >拼箱
+              </el-button>
               <el-button size="mini" type="primary" @click.native="giveUp()" :loading="submitLoading"
                          style="margin-right: 8px;border-radius: 5%;"
               >放弃
               </el-button>
-<!--              <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"-->
-<!--                         style="margin-right: 8px;border-radius: 5%;"-->
-<!--              >保存-->
-<!--              </el-button>-->
               <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
                          style="margin-right: 8px;border-radius: 5%;"
               >提交
@@ -99,7 +99,7 @@
                   v-model="relFormData.batchNo"
                   auto-complete="off"
                   style="width: 90%"
-                  :disabled="true"
+                  :disabled="this.inputDisabled"
                   clearable
                 ></el-input>
               </el-form-item>
@@ -113,7 +113,7 @@
                   clearable
                   value-format="yyyy-MM-dd HH:mm:ss"
                   style="width: 90%"
-                  :disabled="true"
+                  :disabled="this.inputDisabled"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -127,7 +127,7 @@
                   clearable
                   value-format="yyyy-MM-dd HH:mm:ss"
                   style="width: 90%"
-                  :disabled="true"
+                  :disabled="this.inputDisabled"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -140,7 +140,7 @@
                   clearable
                   style="width: 90%"
                   placeholder="请输入备注"
-                  :disabled="true"
+                  :disabled="this.inputDisabled"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -224,7 +224,7 @@
 
   <script>
   import {enterCodeWeb} from "@/api/inout/order";
-  import {addRelCode,scanCodeRelCode} from "@/api/collect/relCode";
+  import {addRelCodeSpellBox,scanCodeRelCode} from "@/api/collect/relCode";
   import A from "@/plugins/KeyScaner";
   export default {
     name: "operateRelCode",
@@ -260,6 +260,7 @@
     },
     data() {
       return {
+        inputDisabled:true,
         //扫码相关
         codeFormData: {
           code: "",
@@ -286,6 +287,8 @@
           detailList:[]
         },
         detailList: [],
+        detailListSpell: [],
+        relFormDatas: [],
         checkPreInArray: [],
         errView: 0,
         actionEnable: false,
@@ -390,6 +393,8 @@
 
                 if (this.relFormData.productCode){
                   this.detailList.push(data);
+                  this.detailListSpell.push(data);
+                  this.inputDisabled = true
                 }
 
                 //存在一个父级关联需-1
@@ -473,11 +478,28 @@
           detailList: []
         }
         this.detailList = []
+        this.detailListSpell = []
         this.parentCode = null
         this.bhxjsl = 0
         this.syxjsl = 0
         this.packLayer = null
       },
+      spellBox() {
+        this.inputDisabled = false
+        const temp = JSON.parse(JSON.stringify(this.relFormData));
+        this.detailListSpell.forEach( item =>{
+          temp.detailList.push(item)
+        });
+        this.relFormDatas.push(temp)
+        this.detailListSpell = []
+        this.relFormData.detailList = []
+        this.relFormData.batchNo = null
+        this.relFormData.madeDate = null
+        this.relFormData.validateDate = null
+        this.inputDisabled = false
+        // console.log("拼凑箱子详情",this.relFormDatas)
+
+      },
       submit() {
         //增加数量是否完全判断
         if( this.bhxjsl != this.syxjsl){
@@ -487,7 +509,15 @@
             type: "warning",
           })
             .then(() => {
-              addRelCode(this.relFormData).then((response) => {
+
+              const temp = JSON.parse(JSON.stringify(this.relFormData));
+              this.detailListSpell.forEach( item =>{
+                temp.detailList.push(item)
+              });
+              this.relFormDatas.push(temp)
+
+              this.loading = true;
+              addRelCodeSpellBox(this.relFormDatas).then((response) => {
                 this.loading = false;
                 if (response.code === 20000) {
                   this.$message.success("保存成功！");
@@ -504,7 +534,14 @@
             .catch(() => {
             });
         }else {
-          addRelCode(this.relFormData).then((response) => {
+          const temp = JSON.parse(JSON.stringify(this.relFormData));
+          this.detailListSpell.forEach( item =>{
+            temp.detailList.push(item)
+          });
+          this.relFormDatas.push(temp)
+
+          this.loading = true;
+          addRelCodeSpellBox(this.relFormDatas).then((response) => {
             this.loading = false;
             if (response.code === 20000) {
               this.$message.success("保存成功！");
@@ -642,6 +679,7 @@
         this.scanCode = "";
         this.result = "";
         this.detailList = [];
+        this.detailListSpell = []
         this.bhxjsl = 0;
         this.syxjsl = 0;
         this.parentCode = null;