新增发货条码批号字段

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -164,6 +164,12 @@
             label="批次号"
             min-width="80"
           ></el-table-column>
+          <el-table-column
+            label="发货条码"
+            prop="barcodes"
+            width="80"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
           <el-table-column
             v-if="dimension == 3 || dimension == 4"
             prop="onlyCode"

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -404,6 +404,12 @@
                   prop="no"
                   :show-overflow-tooltip="true"
                 ></el-table-column>
+                <el-table-column
+                  label="发货条码"
+                  prop="barcodes"
+                  width="80"
+                  :show-overflow-tooltip="true"
+                ></el-table-column>
 
                 <!-- <el-table-column label="生产日期" width="200">
                   <template slot-scope="{ row }">

src/views/warehouseManagement/outgoingManagement/components/batchDetail.vue

@@ -26,6 +26,12 @@
         width="100"
       ></el-table-column>
       <el-table-column label="批次号" prop="batchNo"></el-table-column>
+      <el-table-column
+        label="发货条码"
+        prop="barcodes"
+        width="80"
+        :show-overflow-tooltip="true"
+      ></el-table-column>
       <el-table-column
         label="包装编码"
         prop="code"

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -243,6 +243,12 @@
               width="100"
             ></el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
+            <el-table-column
+              label="发货条码"
+              prop="barcodes"
+              width="80"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column
               label="包装编码"
               prop="code"
@@ -353,6 +359,12 @@
               width="100"
             ></el-table-column>
             <el-table-column label="批次号" prop="batchNo"> </el-table-column>
+            <el-table-column
+              label="发货条码"
+              prop="barcodes"
+              width="80"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column
               label="物料编码"
               prop="no"

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -197,6 +197,11 @@
                 label: '规格',
                 showOverflowTooltip: true
               },
+              {
+                prop: 'manualBatchNo',
+                label: '批号',
+                align: 'center'
+              },
               {
                 prop: 'availableCountBase',
                 label: '计量库存数量',
@@ -306,6 +311,11 @@
                 label: '规格',
                 showOverflowTooltip: true
               },
+              {
+                prop: 'manualBatchNo',
+                label: '批号',
+                align: 'center'
+              },
               {
                 prop: 'packingCountBase',
                 label: '包装库存数量',
@@ -334,6 +344,7 @@
                 width: 130,
                 align: 'center'
               },
+
               {
                 prop: 'measuringUnit',
                 label: '计量单位',
@@ -434,6 +445,16 @@
                 label: '规格',
                 showOverflowTooltip: true
               },
+              {
+                prop: 'manualBatchNo',
+                label: '批号',
+                align: 'center'
+              },
+              {
+                prop: 'barcodes',
+                label: '发货条码',
+                align: 'center'
+              },
               {
                 prop: 'packingCountBase',
                 label: '包装库存数量',
@@ -568,6 +589,16 @@
                 label: '规格',
                 showOverflowTooltip: true
               },
+              {
+                prop: 'manualBatchNo',
+                label: '批号',
+                align: 'center'
+              },
+              {
+                prop: 'barcodes',
+                label: '发货条码',
+                align: 'center'
+              },
               {
                 prop: 'materielCode',
                 label: '物料代号',

src/views/warehouseManagement/stockLedger/components/item-search.vue

@@ -123,6 +123,27 @@
             ></el-input>
           </el-form-item>
         </el-col>
+        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+          <el-form-item label="批号:" prop="manualBatchNo">
+            <el-input
+              clearable
+              v-model="params.manualBatchNo"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col
+          v-if="dimension == 3 || dimension == 4"
+          v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"
+        >
+          <el-form-item label="发货条码:" prop="barcodes">
+            <el-input
+              clearable
+              v-model="params.barcodes"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-col>
         <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
           <div class="ele-form-actions">
             <el-button
@@ -154,7 +175,9 @@
       // 默认表单数据
       const defaultParams = {
         informationName: '',
-        warehouseId: ''
+        warehouseId: '',
+        manualBatchNo: '',
+        barcodes: ''
       };
       return {
         // 表单数据
@@ -193,3 +216,9 @@
     }
   };
 </script>
+<style lang="scss" scoped>
+  ::v-deep .el-row {
+    display: flex;
+    flex-wrap: wrap;
+  }
+</style>

src/views/warehouseManagement/stockManagement/add.vue

@@ -2616,8 +2616,8 @@
       },
       //添加明细
       async onSelectTableData(val) {
+        console.log('val-----------', val);
         const res = await getCode('lot_number_code');
-
         this.warehousingMaterialList.push(
           ...val.map((next) => {
             next.batchNo = res;

src/views/warehouseManagement/stockManagement/details.vue

@@ -334,6 +334,12 @@
             <el-table-column label="批号" prop="manualBatchNo" width="100">
             </el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
+            <el-table-column
+              label="发货条码"
+              prop="barcodes"
+              width="80"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column
               label="包装编码"
               prop="code"
@@ -444,6 +450,12 @@
               width="200"
               :show-overflow-tooltip="true"
             ></el-table-column>
+            <el-table-column
+              label="发货条码"
+              prop="barcodes"
+              width="80"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"