diff --git a/src/api/collect/relCode.js b/src/api/collect/relCode.js
index c2c365b0..bdc5d88d 100644
--- a/src/api/collect/relCode.js
+++ b/src/api/collect/relCode.js
@@ -15,6 +15,13 @@ export function delRelCode(query) {
     params: query
   });
 }
+export function deleteDetail(query) {
+  return axios({
+    url: "/udiwms/relCode/batch/deleteDetail",
+    method: "get",
+    params: query
+  });
+}
 
 export function addRelCode(query) {
   return axios({
@@ -23,6 +30,13 @@ export function addRelCode(query) {
     data: query
   });
 }
+export function deleteAllDetail(query) {
+  return axios({
+    url: "/udiwms/relCode/batch/deleteAllDetail",
+    method: "post",
+    data: query
+  });
+}
 export function addRelCodeSpellBox(query) {
   return axios({
     url: "/udiwms/relCode/batch/addRelCodeSpellBox",
diff --git a/src/views/collect/relCode/operateRelCode.vue b/src/views/collect/relCode/operateRelCode.vue
index 91883cf1..299d3299 100644
--- a/src/views/collect/relCode/operateRelCode.vue
+++ b/src/views/collect/relCode/operateRelCode.vue
@@ -16,11 +16,11 @@
             </div>
             <div style="margin-left: auto;">
               <el-button size="mini" type="primary" @click.native="giveUp()" :loading="submitLoading"
-                         style="margin-right: 8px;border-radius: 5%;"
-              >放弃
+                         style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailList.length == 0"
+              >清空
               </el-button>
               <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
-                         style="margin-right: 8px;border-radius: 5%;"
+                         style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailList.length == 0"
               >提交
               </el-button>
             </div>
@@ -159,6 +159,16 @@
                 <el-table-column label="追溯码" width="250" prop="curCode" show-overflow-tooltip></el-table-column>
                 <el-table-column label="层级" width="150" prop="packLayer" show-overflow-tooltip></el-table-column>
                 <el-table-column label="父级编码" width="250" prop="parentCode" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作"  width="80">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      size="small"
+                      @click.native.stop="deleteDetail(scope.row)"
+                    >删除
+                    </el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </div>
         </el-tab-pane>
@@ -184,7 +194,7 @@
 
   <script>
   import {enterCodeWeb} from "@/api/inout/order";
-  import {addRelCode,scanCodeRelCode} from "@/api/collect/relCode";
+  import {addRelCode,scanCodeRelCode,deleteDetail,deleteAllDetail} from "@/api/collect/relCode";
   import sonRelCode from './sonRelCode.vue';
   import A from "@/plugins/KeyScaner";
   export default {
@@ -304,6 +314,39 @@
       sonRelCode
     },
     methods: {
+      deleteDetail(row) {
+        this.$confirm('确定删除该层级码？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          //删除缓存数据
+          let curCode = row.curCode
+          this.detailList = this.detailList.filter(row => row.curCode !== curCode)
+          this.syxjsl = this.syxjsl - 1
+
+          if (row.packLayer > 1) {
+            this.loading = true
+            //去后端触发删除当前码的关系
+            deleteDetail({ curCode: curCode }).then((response) => {
+              this.loading = false
+              if (response.code === 20000) {
+                this.$message.success('删除成功！')
+              } else {
+                this.$message.error(response.message)
+              }
+            }).catch(() => {
+              this.loading = false
+            })
+          } else {
+            this.$message.success('删除成功！')
+
+          }
+          this.splitChange()
+        })
+          .catch(() => {
+          })
+      },
       splitChange() {
         this.$refs.inputRef.focus();
       },
@@ -473,27 +516,49 @@
         this.errVisible = false;
       },
       giveUp() {
-        this.relFormData = {
-          productCode: null,
-          subTypeNo: null,
-          cascadeRatio: null,
-          packageSpec: null,
-          comment: null,
-          batchNo: null,
-          madeDate: null,
-          validateDate: null,
-          workShop: null,
-          lineName: null,
-          lineManager: null,
-          packUnit: null,
-          bhxjsl: null,
-          detailList: []
-        }
-        this.detailList = []
-        this.parentCode = null
-        this.bhxjsl = 0
-        this.syxjsl = 0
-        this.packLayer = null
+        this.$confirm("确定清空当前操作的数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.loading = true;
+            deleteAllDetail(this.detailList).then((response) => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.$message.success("清空成功！");
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+              .catch(() => {
+                this.loading = false;
+              });
+            this.relFormData = {
+              productCode: null,
+              subTypeNo: null,
+              cascadeRatio: null,
+              packageSpec: null,
+              comment: null,
+              batchNo: null,
+              madeDate: null,
+              validateDate: null,
+              workShop: null,
+              lineName: null,
+              lineManager: null,
+              packUnit: null,
+              bhxjsl: null,
+              detailList: []
+            }
+            this.detailList = []
+            this.parentCode = null
+            this.bhxjsl = 0
+            this.syxjsl = 0
+            this.packLayer = null
+          })
+          .catch(() => {
+          });
+
       },
       submit(val) {
         if(this.detailList == null || this.detailList.length == 0){
diff --git a/src/views/collect/relCode/operateRelCodeSpell.vue b/src/views/collect/relCode/operateRelCodeSpell.vue
index 31ef7727..38b92de0 100644
--- a/src/views/collect/relCode/operateRelCodeSpell.vue
+++ b/src/views/collect/relCode/operateRelCodeSpell.vue
@@ -16,15 +16,15 @@
               </div>
               <div style="margin-left: auto;">
                 <el-button size="mini" type="primary" @click.native="spellBox()" :loading="submitLoading"
-                           style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailListSpell.length == 0"
+                           style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailList.length == 0"
                 >拼箱
                 </el-button>
                 <el-button size="mini" type="primary" @click.native="giveUp()" :loading="submitLoading"
-                           style="margin-right: 8px;border-radius: 5%;"
-                >放弃
+                           style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailList.length == 0"
+                >清空
                 </el-button>
                 <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
-                           style="margin-right: 8px;border-radius: 5%;"
+                           style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailList.length == 0"
                 >提交
                 </el-button>
               </div>
@@ -51,7 +51,7 @@
                     v-model="relFormData.batchNo"
                     auto-complete="off"
                     style="width: 90%"
-                    :disabled="this.parentCode && this.detailList.length > 0"
+                    :disabled="this.inputDisabled"
                     clearable
                   ></el-input>
                 </el-form-item>
@@ -65,7 +65,7 @@
                     clearable
                     value-format="yyyy-MM-dd"
                     style="width: 90%"
-                    :disabled="this.parentCode && this.detailList.length > 0"
+                    :disabled="this.inputDisabled"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -79,7 +79,7 @@
                     clearable
                     value-format="yyyy-MM-dd"
                     style="width: 90%"
-                    :disabled="this.parentCode && this.detailList.length > 0"
+                    :disabled="this.inputDisabled"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -92,7 +92,7 @@
                     clearable
                     style="width: 90%"
                     placeholder="请输入备注"
-                    :disabled="this.parentCode && this.detailList.length > 0"
+                    :disabled="this.inputDisabled"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -163,6 +163,16 @@
                 <el-table-column label="追溯码" width="250" prop="curCode" show-overflow-tooltip></el-table-column>
                 <el-table-column label="层级" width="150" prop="packLayer" show-overflow-tooltip></el-table-column>
                 <el-table-column label="父级编码" width="250" prop="parentCode" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作"  width="80">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      size="small"
+                      @click.native.stop="deleteDetail(scope.row)"
+                    >删除
+                    </el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </div>
         </el-tab-pane>
@@ -188,7 +198,7 @@
 
   <script>
   import {enterCodeWeb} from "@/api/inout/order";
-  import {addRelCodeSpellBox,scanCodeRelCode} from "@/api/collect/relCode";
+  import {addRelCodeSpellBox,scanCodeRelCode,deleteDetail,deleteAllDetail} from "@/api/collect/relCode";
   import sonRelCode from './sonRelCodeSpell.vue';
   import A from "@/plugins/KeyScaner";
   export default {
@@ -311,6 +321,40 @@
       sonRelCode
     },
     methods: {
+      deleteDetail(row) {
+        this.$confirm('确定删除该层级码？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          //删除缓存数据
+          let curCode = row.curCode
+          this.detailList = this.detailList.filter(row => row.curCode !== curCode)
+          this.detailListSpell = this.detailListSpell.filter(row => row.curCode !== curCode)
+          this.syxjsl = this.syxjsl - 1
+
+          if (row.packLayer > 1) {
+            this.loading = true
+            //去后端触发删除当前码的关系
+            deleteDetail({ curCode: curCode }).then((response) => {
+              this.loading = false
+              if (response.code === 20000) {
+                this.$message.success('删除成功！')
+              } else {
+                this.$message.error(response.message)
+              }
+            }).catch(() => {
+              this.loading = false
+            })
+          } else {
+            this.$message.success('删除成功！')
+
+          }
+          this.splitChange()
+        })
+          .catch(() => {
+          })
+      },
       splitChange() {
         this.$refs.inputRef.focus();
       },
@@ -483,28 +527,51 @@
         this.errVisible = false;
       },
       giveUp() {
-        this.relFormData = {
-          productCode: null,
-          subTypeNo: null,
-          cascadeRatio: null,
-          packageSpec: null,
-          comment: null,
-          batchNo: null,
-          madeDate: null,
-          validateDate: null,
-          workShop: null,
-          lineName: null,
-          lineManager: null,
-          packUnit: null,
-          bhxjsl: null,
-          detailList: []
-        }
-        this.detailList = []
-        this.detailListSpell = []
-        this.parentCode = null
-        this.bhxjsl = 0
-        this.syxjsl = 0
-        this.packLayer = null
+        this.$confirm("确定清空当前操作的数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.loading = true;
+            deleteAllDetail(this.detailList).then((response) => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.$message.success("清空成功！");
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+              .catch(() => {
+                this.loading = false;
+              });
+            this.relFormData = {
+              productCode: null,
+              subTypeNo: null,
+              cascadeRatio: null,
+              packageSpec: null,
+              comment: null,
+              batchNo: null,
+              madeDate: null,
+              validateDate: null,
+              workShop: null,
+              lineName: null,
+              lineManager: null,
+              packUnit: null,
+              bhxjsl: null,
+              detailList: []
+            }
+            this.detailList = []
+            this.detailListSpell = []
+            this.parentCode = null
+            this.bhxjsl = 0
+            this.syxjsl = 0
+            this.packLayer = null
+          })
+          .catch(() => {
+          });
+
+
       },
       spellBox() {
         const temp = JSON.parse(JSON.stringify(this.relFormData));
diff --git a/src/views/collect/relCode/sonRelCode.vue b/src/views/collect/relCode/sonRelCode.vue
index 8eae0570..e740afeb 100644
--- a/src/views/collect/relCode/sonRelCode.vue
+++ b/src/views/collect/relCode/sonRelCode.vue
@@ -15,12 +15,12 @@
               <span v-if="parentCode" style="margin-left: 30px"><strong>{{ parentCode || '暂未录入'}}</strong> <strong>  (<span style="color: #FF0000;">{{ syxjsl || 0}}</span>/<span >{{ bhxjsl || 0}}</span>)</strong></span>
             </div>
             <div style="margin-left: auto;">
-              <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="giveUp()" :loading="submitLoading"-->
+<!--                         style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailList.length == 0"-->
+<!--              >清空-->
+<!--              </el-button>-->
               <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
-                         style="margin-right: 8px;border-radius: 5%;"
+                         style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailList.length == 0"
               >提交
               </el-button>
             </div>
@@ -159,6 +159,16 @@
                 <el-table-column label="追溯码" width="250" prop="curCode" show-overflow-tooltip></el-table-column>
                 <el-table-column label="层级" width="150" prop="packLayer" show-overflow-tooltip></el-table-column>
                 <el-table-column label="父级编码" width="250" prop="parentCode" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作"  width="80">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      size="small"
+                      @click.native.stop="deleteDetail(scope.row)"
+                    >删除
+                    </el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </div>
         </el-tab-pane>
@@ -169,7 +179,7 @@
 
   <script>
   import {enterCodeWeb} from "@/api/inout/order";
-  import {addRelCode,scanCodeRelCode} from "@/api/collect/relCode";
+  import {addRelCode,scanCodeRelCode,deleteDetail} from "@/api/collect/relCode";
   import A from "@/plugins/KeyScaner";
   export default {
     name: "operateRelCode",
@@ -286,6 +296,39 @@
       };
     },
     methods: {
+      deleteDetail(row) {
+        this.$confirm('确定删除该层级码？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          //删除缓存数据
+          let curCode = row.curCode
+          this.detailList = this.detailList.filter(row => row.curCode !== curCode)
+          this.syxjsl = this.syxjsl - 1
+
+          if (row.packLayer > 1) {
+            this.loading = true
+            //去后端触发删除当前码的关系
+            deleteDetail({ curCode: curCode }).then((response) => {
+              this.loading = false
+              if (response.code === 20000) {
+                this.$message.success('删除成功！')
+              } else {
+                this.$message.error(response.message)
+              }
+            }).catch(() => {
+              this.loading = false
+            })
+          } else {
+            this.$message.success('删除成功！')
+
+          }
+          this.splitChange()
+        })
+          .catch(() => {
+          })
+      },
       splitChange() {
         this.$refs.inputRef.focus();
       },
@@ -591,6 +634,7 @@
         this.syxjsl = 0;
         this.parentCode = null;
         this.refreshCodesPanel()
+        this.closeDialog()
       },
       init(){
         if(this.opeParentCode != null){
diff --git a/src/views/collect/relCode/sonRelCodeSpell.vue b/src/views/collect/relCode/sonRelCodeSpell.vue
index 06c5035d..4a791f8e 100644
--- a/src/views/collect/relCode/sonRelCodeSpell.vue
+++ b/src/views/collect/relCode/sonRelCodeSpell.vue
@@ -19,12 +19,12 @@
                          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="giveUp()" :loading="submitLoading"-->
+<!--                         style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailListSpell.length == 0"-->
+<!--              >清空-->
+<!--              </el-button>-->
               <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
-                         style="margin-right: 8px;border-radius: 5%;"
+                         style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailListSpell.length == 0"
               >提交
               </el-button>
             </div>
@@ -163,6 +163,16 @@
                 <el-table-column label="追溯码" width="250" prop="curCode" show-overflow-tooltip></el-table-column>
                 <el-table-column label="层级" width="150" prop="packLayer" show-overflow-tooltip></el-table-column>
                 <el-table-column label="父级编码" width="250" prop="parentCode" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作"  width="80">
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      size="small"
+                      @click.native.stop="deleteDetail(scope.row)"
+                    >删除
+                    </el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </div>
         </el-tab-pane>
@@ -173,7 +183,7 @@
 
   <script>
   import {enterCodeWeb} from "@/api/inout/order";
-  import {addRelCodeSpellBox,scanCodeRelCode} from "@/api/collect/relCode";
+  import {addRelCodeSpellBox,scanCodeRelCode,deleteDetail} from "@/api/collect/relCode";
   import A from "@/plugins/KeyScaner";
   export default {
     name: "operateRelCode",
@@ -293,6 +303,40 @@
       };
     },
     methods: {
+      deleteDetail(row) {
+        this.$confirm('确定删除该层级码？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          //删除缓存数据
+          let curCode = row.curCode
+          this.detailList = this.detailList.filter(row => row.curCode !== curCode)
+          this.detailListSpell = this.detailListSpell.filter(row => row.curCode !== curCode)
+          this.syxjsl = this.syxjsl - 1
+
+          if (row.packLayer > 1) {
+            this.loading = true
+            //去后端触发删除当前码的关系
+            deleteDetail({ curCode: curCode }).then((response) => {
+              this.loading = false
+              if (response.code === 20000) {
+                this.$message.success('删除成功！')
+              } else {
+                this.$message.error(response.message)
+              }
+            }).catch(() => {
+              this.loading = false
+            })
+          } else {
+            this.$message.success('删除成功！')
+
+          }
+          this.splitChange()
+        })
+          .catch(() => {
+          })
+      },
       splitChange() {
         this.$refs.inputRef.focus();
       },
@@ -640,6 +684,7 @@
         this.parentCode = null;
         this.inputDisabled = false
         this.refreshCodesPanel()
+        this.closeDialog()
       },
       init(){
         if(this.opeParentCode != null){