Merge branch '20240912_adapter' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into 20240912_adapter

src/views/collect/DealOrderPre.vue

@@ -37,7 +37,7 @@
 <!--              </el-button>-->
               <el-button
                 type="primary"
-                :disabled="!formData.billNo || formData.preInBillNo"
+                :disabled="!formData.billNo || addCodeFlag"
                 @click.native="selectPreorder()"
               >选预验收入库单
               </el-button>
@@ -533,6 +533,7 @@ export default {
       },
       curRow: null,
       panelALive: false,
+      addCodeFlag: false,
       autoFinishOrderFlag: true,//是否对完成的单据提示立即提交
 
       //扫码相关
@@ -1129,6 +1130,7 @@ export default {
           this.formData.insert = false;
           this.formData = res.data;
           this.curRow = this.formData;
+          this.addCodeFlag = true
           this.$refs.inputRef.focus();
           this.refreshCodesPanel(this);
         } else {
@@ -1556,6 +1558,7 @@ export default {
         fromCorp: null,
       };
       this.checkPreInArray = []
+      this.addCodeFlag = false
       this.selectSysParam()
       this.curRow = null
       this.formData.confirmFinish = false;