生产查询

src/views/modules/boxManage/com_saleBoxManage_boxing.vue

@@ -454,15 +454,18 @@ export default {
     },
 
     handleBoxAction() {
-      const arr = this.scanRollNo.split(';');
-      if (arr.length < 3) {
-        this.$message.error('扫描的标签格式不正确！');
-        return;
+      // const arr = this.scanRollNo.split(';');
+      // if (arr.length < 3) {
+      //   this.$message.error('扫描的标签格式不正确！');
+      //   return;
+      // }
+      if(this.scanRollNo==null||this.scanRollNo===''){
+        this.$message.error('请扫描标签！');
       }
       const inData = {
-        site: arr[0],
-        buNo: arr[1],
-        finalRollNo: arr[2],
+        site:  this.boxData.site,
+        buNo: this.boxData.buNo,
+        finalRollNo: this.scanRollNo,
         boxNo: this.boxData.boxNo,
       };
       if(this.boxActionType==='add'){

src/views/modules/boxManage/saleBoxManage.vue

@@ -78,9 +78,6 @@
     </el-pagination>
 
     <el-tabs v-model="activeName" style="margin-top: 0px; width: 99%;" @tab-click="tabClick" class="customer-tab" type="border-card">
-      <el-tab-pane label="装箱清单" name="boxing" style="">
-        <boxing ref="boxing"></boxing>
-      </el-tab-pane>
       <el-tab-pane label="出库单明细" name="outboundDetail">
         <el-table
           :data="detailList"
@@ -104,6 +101,9 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
+      <el-tab-pane label="装箱清单" name="boxing" style="">
+        <boxing ref="boxing"></boxing>
+      </el-tab-pane>
       <el-tab-pane label="已扫描卷" name="rollDetail">
         <el-table
           :data="rollList"
@@ -211,7 +211,7 @@ export default {
       mainDataList:[],
       detailList:[],
       dataListLoading: false,
-      activeName: 'boxing',
+      activeName: 'outboundDetail',
       columnArray1: [
         {
           userId: this.$store.state.user.name,

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -491,7 +491,7 @@
                 v-model="popoverFlag"
                 trigger="click">
                 <div style="text-align: right; margin: 0;width: 120px;">
-                  <el-button type="primary" v-if="this.scheduleData.preItemNo <= 0" @click="finishPartRollModal"
+                  <el-button type="primary" v-if="scheduleData.preItemNo <= 0" @click="finishPartRollModal"
                              style=" width: 120px; margin-bottom: 5px; margin-left: 3PX">
                     {{ buttons.preReport }}
                   </el-button>