diff --git a/src/views/collect/relCode/operateRelCode.vue b/src/views/collect/relCode/operateRelCode.vue
new file mode 100644
index 00000000..7143f071
--- /dev/null
+++ b/src/views/collect/relCode/operateRelCode.vue
@@ -0,0 +1,773 @@
+<template>
+    <div>
+      <el-form
+        :model="relFormData"
+        :rules="formRules"
+        ref="dataForm"
+        @submit.native.prevent
+        label-width="110px"
+      >
+        <el-card>
+          <el-row style="margin-bottom: 8px">
+            <el-button-group
+              style="display: flex; margin-top: 5px; float: right"
+            >
+              <!-- <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
+                         style="margin-right: 8px;border-radius: 5%;"
+              >添加完成
+              </el-button>         -->
+            </el-button-group>
+          </el-row>
+          <el-row>
+            <el-col :span="11">
+              <el-form-item prop="cpmctymc" class="query-form-item" label="产品名称:">
+                <el-input
+                  v-model="relFormData.cpmctymc"
+                  auto-complete="off"
+                  style="width: 90%"
+                  :disabled="true"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item prop="packageSpec" class="query-form-item" label="规格型号:">
+                <el-input
+                  v-model="relFormData.packageSpec"
+                  auto-complete="off"
+                  style="width: 90%"
+                  :disabled="true"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item prop="productCode" class="query-form-item" label="产品编码:">
+                <el-input
+                  v-model="relFormData.productCode"
+                  auto-complete="off"
+                  style="width: 90%"
+                  :disabled="true"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item prop="cascadeRatio" class="query-form-item" label="包装比例:">
+                <el-input
+                  v-model="relFormData.cascadeRatio"
+                  auto-complete="off"
+                  style="width: 90%"
+                  :disabled="true"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item prop="packLayer" class="query-form-item" label="当前层级:">
+                <el-input
+                  v-model="relFormData.packLayer"
+                  auto-complete="off"
+                  style="width: 90%"
+                  :disabled="true"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item prop="packUnit" class="query-form-item" label="层级单位:">
+                <el-input
+                  v-model="relFormData.packUnit"
+                  auto-complete="off"
+                  style="width: 90%"
+                  :disabled="true"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item prop="batchNo" class="query-form-item" label="批次号:">
+                <el-input
+                  v-model="relFormData.batchNo"
+                  auto-complete="off"
+                  style="width: 90%"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item prop="madeDate" class="query-form-item" label="生产日期:">
+                <el-date-picker
+                  v-model="relFormData.madeDate"
+                  type="datetime"
+                  placeholder="日期"
+                  clearable
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  style="width: 90%"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item prop="validateDate" class="query-form-item" label="失效日期:">
+                <el-date-picker
+                  v-model="relFormData.validateDate"
+                  type="datetime"
+                  placeholder="日期"
+                  clearable
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  style="width: 90%"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item prop="comment" class="query-form-item" label="备注:">
+                <el-input
+                  v-model="relFormData.comment"
+                  auto-complete="off"
+                  clearable
+                  style="width: 90%"
+                  placeholder="请输入备注"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <el-row>
+            <el-col :span="18">
+              <el-form-item prop="code" label="扫码录入:">
+                <el-input
+                  id="inputer"
+                  @focus="getInputFocus($event)"
+                  @keypress.enter.native="enterKey($event)"
+                  ref="inputRef"
+                  style="ime-mode: disabled"
+                  type="tel"
+                  placeholder="请点击输入框进行扫码设置或者扫码录入"
+                  v-model="scanCode"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-button-group>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click.native.stop="enterKey()"
+                  style="margin-left: 15px"
+                >添加
+                </el-button>
+              </el-button-group>
+            </el-col>
+          </el-row>
+  
+          <el-alert
+            title="扫码结果:"
+            :type="scanResultType"
+            :closable="false"
+            :description="result">
+          </el-alert>
+          <el-alert
+            v-if="warnVisible"
+            title="警告信息:"
+            type="warning"
+            :closable="true"
+            :dangerouslyUseHTMLString="true"
+            :description="warnResult">
+          </el-alert>
+          <el-alert
+            v-if="errVisible"
+            title="错误信息:"
+            type="warning"
+            :closable="true"
+            :dangerouslyUseHTMLString="true"
+            :description="errResult">
+          </el-alert>
+        </el-card>
+      </el-form>
+      <el-tabs type="border-card" style="margin: 15px">
+        <el-tab-pane label="关联详情">
+          <div>
+            <span><strong>父级编码：{{ parentCode || '暂未录入'}}</strong> <strong>  (<span style="color: #FF0000;">{{ syxjsl || 0}}</span>/<span >{{ bhxjsl || 0}}</span>)</strong></span>
+          </div>
+          <div>
+              <el-table v-loading="loading" 
+              :data="detailList" 
+              style="width: 100%;" max-height="350" height="350"
+              border
+              :row-style="rowStyle"
+              ref="multipleTable">
+                <el-table-column type="index" label="序号" width="50"></el-table-column>
+                <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>
+            </div>
+        </el-tab-pane>
+      </el-tabs>
+      
+      <el-dialog
+        :title="title"
+        :visible.sync="popDialogVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="90%"
+        v-if="popDialogVisible"
+        @close='popCloseDialog'
+      >
+      <popRelCode
+          :popCloseDialog="popCloseDialog"
+          :popParentCode="popParentCode"
+          :popRelFormData ="popRelFormData"
+      ></popRelCode>
+    </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import {enterCodeWeb} from "@/api/inout/order";
+  import {addRelCode,scanCodeRelCode} from "@/api/collect/relCode";
+  import popRelCode from './popRelCode.vue';
+  import A from "@/plugins/KeyScaner";
+  export default {
+    name: "operateRelCode",
+    props: {
+      closeDialog: {
+        type: Function,
+        required: true,
+      },
+      orderQuery: {
+        type: Object,
+        required: true,
+        default: {}
+      },
+      resetKey: {
+        type: Function,
+        required: true
+      },
+      opeParentCode:{
+        type: String,
+        required: true,
+        default: ""
+      },
+      opeRelFormData:{
+        type: Object,
+        required: true,
+        default: {}
+      }
+    },
+    watch: {
+      resetKey(newVal, oldVal) {
+        this.$refs.inputRef.focus();
+      }
+    },
+    data() {
+      return {
+        userInfo: {
+          inv: this.$store.getters.locInvName,
+          deptName: this.$store.getters.locDeptName,
+          userName: this.$store.getters.name,
+          userId: this.$store.getters.userId,
+          companyName: this.$store.getters.companyName,
+        },
+        //扫码相关
+        codeFormData: {
+          code: "",
+          batchNo: null,
+          produceDate: null,
+          expireDate: null,
+          serialNo: null,
+          relId: null,
+        },
+        relFormData: {
+          productCode: null,
+          subTypeNo: null,
+          cascadeRatio: null,
+          packageSpec: null,
+          comment: null,
+          batchNo: null,
+          madeDate: null,
+          validateDate: null,
+          workShop: null,
+          lineName: null,
+          lineManager: null,
+          detailList:[]
+        },
+        detailList: [],
+        checkPreInArray: [],
+        errView: 0,
+        isCodeAlive: true,
+        isCheckResultAlive: true,
+        isBizDetailAlive: true,
+        isCodeDetailAlive: true,
+        isSickerAlive: true,
+        actionEnable: false,
+        formRules: {
+          // productCode: [
+          //   {required: true, message: "请输入产品编号", trigger: "blur"},
+          // ],
+          // subTypeNo: [
+          //   {required: true, message: "请输入类型编号", trigger: "blur"},
+          // ],
+          // cascadeRatio: [
+          //   {required: true, message: "请输入包装比例", trigger: "change"},
+          // ],
+          // packageSpec: [
+          //   {required: true, message: "请输入包装规格", trigger: "change"},
+          // ],
+          batchNo: [
+            {required: true, message: "请输入批次号", trigger: "blur"},
+          ],
+          madeDate: [
+            {required: true, message: "请选入生产日期", trigger: "blur"},
+          ],
+          validateDate: [
+            {required: true, message: "请选入有效日期", trigger: "blur"},
+          ],      
+        },
+        isScan: true,
+        scanText: "扫码录入：",
+        corpOrderIdDisabled: false,
+        isSupVesion: false,
+        loading: false,
+        index: null,
+        formVisible: false,
+        deleteLoading: false,
+        orderNo: null,
+        fromStorageOptions: [],
+        curRow: null,
+        dialogTableVisible: false,
+        selectRlVisible: false,
+        selectSpaceVisible: false,
+        sitcomScan: false,
+        sictomText: "",
+        originCode: "",
+        checkSuccess: false,
+        codeDetail: null,
+        fromDeptOptions: [],
+        submitLoading: false,
+        scanCode: "",
+        isSuccess: false,
+        result: "",
+        scanResultType: "success",
+        splitType: null,
+        warnResult: "",
+        errResult: "",
+        warnVisible: false,
+        errVisible: false,
+        parentCode:null,
+        bhxjsl:0,
+        syxjsl:0,
+        popDialogVisible:false,
+        title:null,
+        popParentCode:null,
+        popRelFormData:null,
+        popLevel:1,
+      };
+    },
+    components: {
+      popRelCode
+    },
+    methods: {
+      splitChange() {
+        this.$refs.inputRef.focus();
+      },
+      popCloseDialog() {
+        this.popDialogVisible = false;
+        //清空
+        this.detailList = [];
+        this.bhxjsl = 0;
+        this.syxjsl = 0;
+        this.parentCode = null
+        
+      },
+      //添加条码
+      addCode() {
+        let tQuery = Object.assign(this.codeFormData);
+        tQuery.curCode = this.codeFormData.code;
+        tQuery.parentCode = this.parentCode;
+        scanCodeRelCode(tQuery).then((response) => {
+          if (response.code === 20000) {
+            this.$refs.inputRef.focus();
+            this.$refs.inputRef.select();
+            this.isSuccess = true;
+            let data = response.data;
+            if(data !== null){
+              if(this.detailList.some(item => item.curCode === data.curCode)) {
+                //码重复提示
+                this.$message.warning("录入码重复！");
+              } else {
+                if( this.bhxjsl !=0 && this.syxjsl != 0 && this.bhxjsl === this.syxjsl){
+                  //满了自动保存
+                  this.$message.warning("包含下级码已录满！");
+                  return;
+                }
+                this.detailList.push(data);
+                //存在一个父级关联需-1
+                this.syxjsl = this.detailList.length - 1;
+              }
+              //判断是否是下级 
+              if(data.packLayer > 1){
+                this.relFormData = data;
+                this.parentCode = data.curCode;
+                this.bhxjsl = data.bhxjsl;
+                //弹框
+                this.popDialogVisible = true;
+                this.popRelFormData = data;
+                this.title = "手工关联:" + data.curCode;
+                this.popParentCode = data.curCode;
+              }
+            }
+            
+          }else{
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+      },
+
+      refreshCodesPanel() {
+        this.warnVisible = false;
+        this.errVisible = false;
+  
+        this.isCodeAlive = false;
+        this.isBizDetailAlive = false;
+        this.isCodeDetailAlive = false;
+        this.isSickerAlive = false;
+  
+        this.$nextTick(() => {
+          //重新加载组件
+          this.isCodeAlive = true;
+          this.isBizDetailAlive = true;
+          this.isCodeDetailAlive = true;
+          this.isSickerAlive = true;
+  
+        });
+  
+        //选择性刷新
+        if (this.isCheckResultAlive) {
+          this.isCheckResultAlive = false;
+          this.$nextTick(() => {
+            //重新加载组件
+            this.isCheckResultAlive = true;
+          });
+        }
+      },
+      refreshOrder(orderQuery) {
+        this.relFormData = orderQuery;
+        this.scanCode = "";
+        this.result = "";
+        this.refreshCodesPanel()
+      },
+  
+      submit(val) {
+        if(this.detailList == null || this.detailList.length == 0){
+          this.$message.warning("请先录入关联码！");
+          return;
+        }
+        if (this.relFormData.batchNo == null) {
+          this.$message.warning("请输入批次号！");
+          return;
+        }
+        if (this.relFormData.madeDate == null) {
+          this.$message.warning("请选择生产日期！");
+          return;
+        }
+        if (this.relFormData.validateDate == null) {
+          this.$message.warning("请选择失效日期！");
+          return;
+        }
+        this.loading = true;
+        this.relFormData.detailList = this.detailList;
+        addRelCode(this.relFormData).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("保存成功！");
+            this.clearRel();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.clearRel();
+        });
+  
+      },
+      // 刷新表单
+      resetForm() {
+        if (this.$refs["dataForm"]) {
+          // 清空验证信息表单
+          this.$refs["dataForm"].clearValidate();
+          // 刷新表单
+          this.$refs["dataForm"].resetFields();
+        }
+      },
+      enterKey(event) {
+        this.warnResult = "";
+        this.errResult = "";
+        this.result = "";
+        this.warnVisible = false;
+        this.errVisible = false;
+  
+        this.checkSuccess = true;
+        this.codeFormData.code = this.scanCode.trim();
+        let tQuery = {
+          originCode: this.originCode,
+          code: this.codeFormData.code.trim(),
+        };
+        enterCodeWeb(tQuery).then((response) => {
+          if (response.code === 20000) {
+            this.$refs.inputRef.focus();
+            this.$refs.inputRef.select();
+            this.isSuccess = true;
+            this.printCodeResult(response.data)
+            this.codeFormData.code = response.data.code;
+            this.scanCode = ""
+            this.addCode();
+          } else {
+            if (response.code == 502) {
+              this.checkSuccess = false;
+              this.isSuccess = false;
+              this.scanCode = ""
+              this.printCodeResult(response.data)
+              this.codeFormData.code = response.data.code;
+              this.originCode = this.codeFormData.code;
+            } else if (response.code == 501) {
+              this.checkSuccess = false;
+              this.scanCode = ""
+              this.$message.error(response.message);
+            } else if (response.code == 503) {
+              this.checkSuccess = false;
+              this.isSuccess = false;
+              this.scanCode = ""
+              this.printCodeResult(response.data)
+              this.codeFormData.code = response.data.code;
+              this.$confirm(response.message, "提示", {
+                type: "warning",
+              })
+                .then(() => {
+                  this.codeFormData.code = response.data.code;
+                  this.addCode();
+                })
+                .catch(() => {
+                  this.codeFormData.code = response.data.code;
+                });
+            } else if (response.code == 508) {
+              this.scanCode = ""
+              this.originCode = "";
+              this.codeFormData.code = "01" + response.data.nameCode;
+              this.originCode = this.codeFormData.code;
+            } else {
+              this.$alert(response.message, "提示", {
+                confirmButtonText: "确定",
+                type: "warning",
+                closeOnClickModal: true,
+                callback: (action) => {
+                  this.$refs.inputRef.focus();
+                  this.$refs.inputRef.select();
+                },
+              });
+            }
+          }
+          this.loading = false;
+        });
+  
+      },
+      printCodeResult(data, isSuccess) {
+        const resultParts = ["扫码解析结果：" + data.code];
+  
+        if (data.udi) {
+          resultParts.push("层级标识: " + data.udi);
+        }
+        if (data.batchNo) {
+          resultParts.push("批次号: " + data.batchNo);
+        }
+        if (data.produceDate) {
+          resultParts.push("生产日期: " + data.produceDate);
+        }
+        if (data.expireDate) {
+          resultParts.push("失效日期: " + data.expireDate);
+        }
+        if (data.serialNo) {
+          resultParts.push("序列号: " + data.serialNo);
+        }
+        this.result = resultParts.join(" , ");
+      },
+      getInputFocus(event) {
+        event.currentTarget.select();
+      },
+  
+      clearRel() {        
+        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,
+          cpmctymc:null,
+        }
+        this.scanCode = "";
+        this.result = "";
+        this.detailList = [];
+        this.bhxjsl = 0;
+        this.syxjsl = 0;
+        this.parentCode = null;
+        this.refreshCodesPanel()
+      },
+      init(){
+        if(this.opeParentCode !== ""){
+          this.parentCode = this.opeParentCode;
+        }
+        if(JSON.stringify(this.opeRelFormData) !=="{}"){
+          this.relFormData = this.opeRelFormData;
+          this.detailList.push(this.relFormData);
+          this.bhxjsl = this.relFormData.bhxjsl;
+        }
+      }
+  
+    },
+    filters: {},
+    mounted() {
+      document.body.ondrop = function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+      };
+      var that = this;
+      var inputer = document.getElementById("inputer");
+      window.sc = new A.KeyScaner(inputer); //传入要监听的DOM节点
+      sc.onInput = function (text) {
+        if (text.includes("delete")) {
+          that.codeFormData.code = "";
+          that.sictomText = "";
+          that.originCode = "";
+          return;
+        }
+        if (that.sitcomScan) {
+          let tempTxt = text;
+          let str = tempTxt.replace(/[\r]/g, "");
+          that.sictomText = that.sictomText + str;
+          that.codeFormData.code = that.sictomText;
+        } else {
+          that.codeFormData.code = text;
+        }
+      };
+      inputer.focus();
+      this.$refs.inputRef.focus();
+    },
+    beforeDestroy() {
+      
+    },
+    created() {
+      this.init()
+    },
+  };
+  </script>
+  
+  
+  <style scoped>
+  .scroll-alert {
+    width: 100%; /* 或者你需要的宽度 */
+    overflow: hidden;
+    white-space: nowrap;
+    box-sizing: border-box;
+    /*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*/
+    background-color: rgba(255, 235, 59, 0.1); /* 类似于 Element UI 警告框的背景色 */
+    padding: 10px;
+    position: relative;
+  }
+  
+  .scroll-text {
+    display: inline-block;
+    padding-left: 100%; /* 初始位置在容器右侧 */
+    animation: scroll 10s linear infinite; /* 滚动动画 */
+  }
+  
+  @keyframes scroll {
+    from {
+      transform: translateX(0);
+    }
+    to {
+      transform: translateX(-100%);
+    }
+  }
+  
+  .query-form-item {
+    margin-right: 5px;
+    margin-bottom: 6px;
+  }
+  
+  #inputer {
+    width: 100%;
+    min-height: 30px;
+    background-color: white;
+    border: #d0d0d0;
+    border-style: solid;
+    border-width: 0.1px;
+    color: #4a4a4a;
+  }
+  
+  #inputer:focus {
+    width: 100%;
+    min-height: 30px;
+    background-color: white;
+    border: #0080ff;
+    border-style: solid;
+    border-width: 0.1px;
+    color: #4a4a4a;
+  }
+  
+  .ime-disabled {
+    ime-mode: disabled;
+  }
+  
+  .result-display {
+    border: 2px solid #ccc; /* 默认外框颜色 */
+    border-radius: 10px;
+    margin-top: 5px;
+    margin-left: 15px;
+    margin-right: 25px;
+    padding-left: 25px;
+    /* 不设置背景颜色 */
+  }
+  
+  .result-success {
+    border-color: #4CAF50; /* 成功时外框颜色 */
+  }
+  
+  .result-failure {
+    border-color: #0080ff; /* 失败时外框颜色 */
+  }
+  
+  .result-text {
+    height: 18px;
+    /* 你可以在这里设置默认的文本颜色或其他样式 */
+  }
+  
+  .result-text-success {
+    color: #4CAF50; /* 成功时文本颜色 */
+    font-size: 14px;
+  }
+  
+  .result-text-failure {
+    color: #0080ff; /* 失败时文本颜色 */
+    font-size: 14px;
+  }
+  
+  .mar-left {
+    margin-left: 20px;
+  }
+  </style>
+  
+  
\ No newline at end of file
diff --git a/src/views/collect/relCode/popRelCode.vue b/src/views/collect/relCode/popRelCode.vue
new file mode 100644
index 00000000..97c8db62
--- /dev/null
+++ b/src/views/collect/relCode/popRelCode.vue
@@ -0,0 +1,63 @@
+<template>
+    <div>
+    <operateRelCode
+    ref="operateRelCode"
+    :opeParentCode="parentCode"
+    :opeRelFormData="relFormData"
+    ></operateRelCode>
+    </div>
+  </template>
+  
+  <script>
+  
+  import operateRelCode from "./operateRelCode"
+  
+  export default {
+    name: "popRelCode",
+    props: {
+      popCloseDialog: {
+        type: Function,
+        required: true,
+      },
+      popParentCode: {
+        type: String,
+        required: true,
+        default: ""
+      },
+      popRelFormData:{
+        type: Object,
+        required: true,
+        default: {}
+      }
+  
+    },
+    components: {
+        operateRelCode
+    },
+    data() {
+      return {
+        parentCode:"",
+        relFormData:{}
+      }
+    },
+    methods: {
+      init(){
+        if(this.popParentCode !==""){
+            this.parentCode = this.popParentCode;
+        }
+        if(JSON.stringify(this.popRelFormData) !== "{}"){
+            this.relFormData = this.popRelFormData;
+        }
+      }
+    },
+    created() {
+        this.init();
+    }
+  
+  }
+  </script>
+  
+  <style scoped>
+  
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/collect/relCode/relCode.vue b/src/views/collect/relCode/relCode.vue
index a06ac73a..a34c25f0 100644
--- a/src/views/collect/relCode/relCode.vue
+++ b/src/views/collect/relCode/relCode.vue
@@ -3,23 +3,33 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" label-width="100px" v-if="showSearch">
         <el-row>
-         <el-col :span="4">
-           <el-form-item label="追溯码:">
-             <el-input v-model="filterQuery.curCode"  placeholder="请输入追溯码" clearable></el-input>
+          <el-col :span="12">
+           <el-form-item prop="code" label="扫码录入:">
+            <el-input
+                  id="inputer"
+                  @focus="getInputFocus($event)"
+                  ref="inputRef"
+                  style="ime-mode: disabled"
+                  type="tel"
+                  placeholder="请点击输入框进行扫码设置或者扫码录入"
+                  v-model="filterQuery.code"
+                ></el-input>
            </el-form-item>
          </el-col>
+        </el-row>
+        <el-row>
          <el-col :span="4">
-           <el-form-item label="选择层级:">
-             <el-input v-model="filterQuery.packLayer"  placeholder="请输入层级信息" clearable></el-input>
+           <el-form-item label="产品编码:">
+             <el-input v-model="filterQuery.productCode"  placeholder="请输入产品编码" clearable></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="批次号:">
-             <el-input v-model="filterQuery.packLayer"  placeholder="请输入批次号" clearable></el-input>
+             <el-input v-model="filterQuery.batchNo"  placeholder="请输入批次号" clearable></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="4">
-            <el-form-item label="有效时间:">
+            <el-form-item label="失效日期:">
             <el-date-picker
                 style="width: 100%"
                 :picker-options="pickerOptions"
@@ -42,9 +52,10 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">手动新增</el-button>
+          <!-- <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">手动新增</el-button> -->
           <el-upload
               :action="action"
+              :headers ="headers"
               accept=".xml"
               :on-preview="handlePreview"
               :on-remove="handleRemove"
@@ -56,6 +67,7 @@
               :limit="5"
               :on-exceed="handleExceed"
               :file-list="fileList"
+              :show-file-list="false"
               :data="extraData">
               <el-button size="small" icon="el-icon-upload" type="primary">文件上传</el-button>
               <!-- <div slot="tip" class="el-upload__tip">只能上传xml文件，且不超过5M</div> -->
@@ -70,25 +82,18 @@
                 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
                 style="width: 100%"   row-key="id" >
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="追溯码" prop="curCode"></el-table-column>
-        <el-table-column label="父级码" prop="parentCode"></el-table-column>
-        <el-table-column label="层级" prop="packLayer"></el-table-column>
+        <el-table-column label="产品编码" prop="productCode"></el-table-column>
         <el-table-column label="装箱类型" prop="packageSpec"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="madeDate"></el-table-column>
         <el-table-column label="失效日期" prop="validateDate"></el-table-column>
-        <el-table-column label="产品编码" prop="productCode"></el-table-column>
         <el-table-column label="备注" prop="comment"></el-table-column>
-        <!-- <el-table-column label="生产车间" prop="workShop"></el-table-column>
-        <el-table-column label="生产线" prop="lineName"></el-table-column>
-        <el-table-column label="负责人" prop="lineManager"></el-table-column>
         <el-table-column label="操作" width="120px">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
-            </el-button>
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
+            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">拼箱</el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column> 
       </el-table>
 
       <pagination
@@ -110,18 +115,19 @@
         v-if="newSpDistributionVisible"
         @close='closeDialog'
       >
-        <relCodeEdit
+        <operateRelCode
           :closeDialog="closeDialog"
           :orderQuery="idQuery"
-        ></relCodeEdit>
+        ></operateRelCode>
       </el-dialog>
 
     </el-card>
   </div>
 </template>
 <script>
-import {getDetailList,delRelCode} from "@/api/collect/relCode";
-import relCodeEdit from "@/views/collect/relCode/relCodeEdit"
+import {getList,delRelCode} from "@/api/collect/relCode";
+import {getAdminId, getToken} from '@/utils/auth';
+import operateRelCode from "@/views/collect/relCode/operateRelCode"
 import Treeselect from "@riophae/vue-treeselect";
 
 export default {
@@ -132,9 +138,7 @@ export default {
       newSpDistributionVisible: false,
       filterQuery: {
         billAction: null,
-        billNo: "",
-        originType: null,
-        thirdSysFk: "",
+        billNo: "",        
         page: 1,
         limit: 10,
         corpName: null
@@ -146,6 +150,8 @@ export default {
       list: [],
       formData: null,
       total: 0,
+      actDateRange:[],
+      scanCode:null,
       pickerOptions: {
         shortcuts: [
           {
@@ -177,6 +183,10 @@ export default {
           },
         ],
       },
+      headers:{
+        ADMINID: getAdminId(),
+        ADMINTOKEN: getToken()
+      },
       extraData:{"uuid": "upload-xml"},
       uploadLoading: false,
       action: process.env.VUE_APP_BASE_API + "/udiwms/relCode/batch/xmlUpload",
@@ -196,6 +206,7 @@ export default {
         billAction: null,
         startDate: null,
         endDate: null,
+        code:null,
         page: 1,
         limit: 10,
         corpName: null,
@@ -215,7 +226,7 @@ export default {
     newDistributionForm(index, row) {
       if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
         this.idQuery = row;
-        this.formName = "编辑";
+        this.formName = "拼箱";
         this.newSpDistributionVisible = true;
       } else {
         this.formName = "新增";
@@ -227,22 +238,41 @@ export default {
       this.getList();
       this.detailList = [];
     },
+    getInputFocus(event) {
+        event.currentTarget.select();
+    },
     deleteDialog(row) {
-      delRelCode({id:row.id})
-        .then((response) => {
-          if (response.code == 20000) {
-             this.getList();
-          } else {
-            this.$message.error(response.message);
-          }
-        })
+      this.$confirm("此操作将永久删除关联记录, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delRelCode({id:row.id})
+          .then((response) => {
+            if (response.code == 20000) {
+              this.getList();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
         .catch(() => {
 
         });
+        })
+        .catch(() => {
+        });
     },
     getList() {
       this.loading = true;
-      getDetailList(this.filterQuery)
+      if (this.actDateRange !== null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      getList(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
             this.list = response.data.list || [];
@@ -309,17 +339,40 @@ export default {
     }
   },
   components: {
-    relCodeEdit,
+    operateRelCode,
     Treeselect,
   },
   filters: {},
   mounted() {
-  }
-  ,
+      document.body.ondrop = function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+      };
+      var that = this;
+      var inputer = document.getElementById("inputer");
+      window.sc = new A.KeyScaner(inputer); //传入要监听的DOM节点
+      sc.onInput = function (text) {
+        if (text.includes("delete")) {
+          that.codeFormData.code = "";
+          that.sictomText = "";
+          that.originCode = "";
+          return;
+        }
+        if (that.sitcomScan) {
+          let tempTxt = text;
+          let str = tempTxt.replace(/[\r]/g, "");
+          that.sictomText = that.sictomText + str;
+          that.codeFormData.code = that.sictomText;
+        } else {
+          that.codeFormData.code = text;
+        }
+      };
+      inputer.focus();
+      this.$refs.inputRef.focus();
+  },
   created() {
     this.getList();
-  }
-  ,
+  },
 }
 ;
 </script>
diff --git a/src/views/collect/relCode/relCodeEdit.vue b/src/views/collect/relCode/relCodeEdit.vue
index 94f3f27c..dce4ec03 100644
--- a/src/views/collect/relCode/relCodeEdit.vue
+++ b/src/views/collect/relCode/relCodeEdit.vue
@@ -131,13 +131,6 @@
             </el-button-group>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item prop="checked" label="">
-              <el-checkbox v-model="checked">录入父级编码</el-checkbox>
-            </el-form-item>
-          </el-col>
-        </el-row>
 
         <el-alert
           title="扫码结果:"
@@ -166,13 +159,13 @@
     <el-tabs type="border-card" style="margin: 15px">
       <el-tab-pane label="关联详情">
         <div>
-          <el-text tag="b" size="large">待关联数量：<span>0</span></el-text>
-          <el-text tag="b">总关联数量：<span>0</span></el-text>
-          <el-text tag="b" size="large">父级编码：<span>{{ a || '暂未录入'}}</span></el-text>
+          <span><strong>待关联数量：<span style="color: #FF0000;">0</span></strong></span>
+          <span class="mar-left"><strong>总关联数量：0</strong></span>
+          <span class="mar-left"><strong>父级编码：{{ parentCode || '暂未录入'}}</strong></span>
         </div>
         <div>
-            <el-table v-loading="loading"
-            :data="detailList"
+            <el-table v-loading="loading" 
+            :data="detailList" 
             style="width: 100%;" max-height="350" height="350"
             border
             :row-style="rowStyle"
@@ -189,8 +182,8 @@
 </template>
 
 <script>
+import {addOrderWeb,enterCodeWeb,} from "@/api/inout/order";
 import {addRelCode,scanCodeRelCode} from "@/api/collect/relCode";
-// import relCodeDetail from "@/views/collect/relCode/relCodeDetail";
 import A from "@/plugins/KeyScaner";
 
 export default {
@@ -218,6 +211,7 @@ export default {
   },
   data() {
     return {
+      newSpDistributionVisible: false,
       userInfo: {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
@@ -277,7 +271,7 @@ export default {
         ],
         validateDate: [
           {required: true, message: "请选入有效日期", trigger: "blur"},
-        ],
+        ],      
       },
       isScan: true,
       scanText: "扫码录入：",
@@ -309,11 +303,11 @@ export default {
       errResult: "",
       warnVisible: false,
       errVisible: false,
-      checked:true
+      parentCode:null,
+
     };
   },
   components: {
-    // relCodeDetail
   },
   methods: {
     splitChange() {
@@ -331,8 +325,13 @@ export default {
           this.isSuccess = true;
           // this.codeFormData.code = response.data.code;
           console.log("====response=======",response.data)
-          this.detailList.push(response.data);
-          this.printCodeResult(response.data);
+          let data = response.data;
+          //校验码是否重复
+          this.detailList.push(data);
+          this.printCodeResult(data);
+          if(data.parentCode > 1){
+            this.parentCode = data.parentCode;
+          }
           this.scanCode = ""
         }else{
           this.$message.error(response.message);
@@ -344,7 +343,6 @@ export default {
       });
     },
 
-
     refreshCodesPanel() {
       this.warnVisible = false;
       this.errVisible = false;
@@ -372,7 +370,6 @@ export default {
         });
       }
     },
-
     refreshOrder(orderQuery) {
       this.relFormData = orderQuery;
       this.scanCode = "";
@@ -413,16 +410,93 @@ export default {
       }
     },
     enterKey(event) {
-      this.addCode()
+      this.warnResult = "";
+      this.errResult = "";
+      this.result = "";
+      this.warnVisible = false;
+      this.errVisible = false;
+
+      this.checkSuccess = true;
+      this.codeFormData.code = this.scanCode.trim();
+      let tQuery = {
+        originCode: this.originCode,
+        code: this.codeFormData.code.trim(),
+      };
+      enterCodeWeb(tQuery).then((response) => {
+        if (response.code === 20000) {
+          this.$refs.inputRef.focus();
+          this.$refs.inputRef.select();
+          this.isSuccess = true;
+          this.printCodeResult(response.data)
+          this.codeFormData.code = response.data.code;
+          this.scanCode = ""
+          this.addCode();
+        } else {
+          if (response.code == 502) {
+            this.checkSuccess = false;
+            this.isSuccess = false;
+            this.scanCode = ""
+            this.printCodeResult(response.data)
+            this.codeFormData.code = response.data.code;
+            this.originCode = this.codeFormData.code;
+          } else if (response.code == 501) {
+            this.checkSuccess = false;
+            this.scanCode = ""
+            this.$message.error(response.message);
+          } else if (response.code == 503) {
+            this.checkSuccess = false;
+            this.isSuccess = false;
+            this.scanCode = ""
+            this.printCodeResult(response.data)
+            this.codeFormData.code = response.data.code;
+            this.$confirm(response.message, "提示", {
+              type: "warning",
+            })
+              .then(() => {
+                this.codeFormData.code = response.data.code;
+                this.addCode();
+              })
+              .catch(() => {
+                this.codeFormData.code = response.data.code;
+              });
+          } else if (response.code == 508) {
+            this.scanCode = ""
+            this.originCode = "";
+            this.codeFormData.code = "01" + response.data.nameCode;
+            this.originCode = this.codeFormData.code;
+          } else {
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
+              type: "warning",
+              closeOnClickModal: true,
+              callback: (action) => {
+                this.$refs.inputRef.focus();
+                this.$refs.inputRef.select();
+              },
+            });
+          }
+        }
+        this.loading = false;
+      });
+
     },
     printCodeResult(data, isSuccess) {
-      const resultParts = ["扫码解析结果：" + data.curCode];
+      const resultParts = ["扫码解析结果：" + data.code];
 
-      if (data.packLayer) {
-        resultParts.push("层级标识: " + data.packLayer);
+      if (data.udi) {
+        resultParts.push("层级标识: " + data.udi);
+      }
+      if (data.batchNo) {
+        resultParts.push("批次号: " + data.batchNo);
+      }
+      if (data.produceDate) {
+        resultParts.push("生产日期: " + data.produceDate);
+      }
+      if (data.expireDate) {
+        resultParts.push("失效日期: " + data.expireDate);
       }
-      if (data.parentCode) {
-        resultParts.push("父级编码: " + data.parentCode);
+      if (data.serialNo) {
+        resultParts.push("序列号: " + data.serialNo);
       }
       this.result = resultParts.join(" , ");
     },
@@ -481,10 +555,10 @@ export default {
     this.$refs.inputRef.focus();
   },
   beforeDestroy() {
-
+    
   },
   created() {
-
+    
   },
 };
 </script>
@@ -579,6 +653,8 @@ export default {
   font-size: 14px;
 }
 
-
+.mar-left {
+  margin-left: 20px;
+}
 </style>