33

src/components/print/OrderPrint.vue

@@ -369,7 +369,7 @@
             }
           },
           {
-            label: '原料批号',
+            label: '原料批次号',
             key: 'xxx',
             span: 4,
             class: 'border-dashed-right border-dashed-bottom',

src/views/beEntrusted/components/create.vue

@@ -210,7 +210,7 @@
         </el-table-column>
         <el-table-column label="牌号" align="center" prop="brandNo">
         </el-table-column>
-        <el-table-column label="批号" align="center" prop="batchNo">
+        <el-table-column label="批次号" align="center" prop="batchNo">
         </el-table-column>
         <!-- <el-table-column label="型号" align="center" prop="model">
         </el-table-column> -->

src/views/entrust/components/create.vue

@@ -210,7 +210,7 @@
         </el-table-column>
         <el-table-column label="牌号" align="center" prop="brandNo">
         </el-table-column>
-        <el-table-column label="批号" align="center" prop="batchNo">
+        <el-table-column label="批次号" align="center" prop="batchNo">
         </el-table-column>
         <!-- <el-table-column label="型号" align="center" prop="model">
         </el-table-column> -->

src/views/entrust/components/produceOrder.vue

@@ -118,7 +118,7 @@ export default {
         },
         {
           prop: 'batchNo',
-          label: '批号',
+          label: '批次号',
           align: 'center',
           minWidth: 100,
           showOverflowTooltip: true

src/views/exceptionManagement/components/create.vue

@@ -138,7 +138,7 @@
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 8 }">
-          <el-form-item label="批号">
+          <el-form-item label="批次号">
             <el-input v-model="form.relationJson.batchNo" disabled />
           </el-form-item>
         </el-col>

src/views/exceptionManagement/components/produceOrder.vue

@@ -118,7 +118,7 @@ export default {
         },
         {
           prop: 'batchNo',
-          label: '批号',
+          label: '批次号',
           align: 'center',
           minWidth: 100,
           showOverflowTooltip: true

src/views/exceptionManagement/components/productionPlan.vue

@@ -102,7 +102,7 @@ export default {
         },
         {
           prop: 'batchNo',
-          label: '批号',
+          label: '批次号',
           align: 'center',
           minWidth: 100,
           showOverflowTooltip: true

src/views/exceptionManagement/components/transition.js

@@ -64,7 +64,7 @@ export function transitionData(data, type) {
         sumOrderWeight: type == 1 ? (data.sumOrderWeight + data.weightUnit) : (data.formingWeight + ' ' + (data.newWeightUnit || data.weightUnit)),//要求生产重量
         formedNum: data.formedNum && (data.formedNum + ' ' + data.unit),//以生产数量
         formedWeight: data.formedWeight && (data.formedWeight + ' ' + data.weightUnit),//以生产数量
-        batchNo: data.batchNo,//批号
+        batchNo: data.batchNo,//批次号
         brandNo: data.brandNo,//牌号
         priority: type == 1 ? data.salesOrders[0]?.priority : data.priority,//优先级
         produceRoutingId: data.produceRoutingId,//工艺id

src/views/exceptionManagement/components/workOrder.vue

@@ -109,7 +109,7 @@ export default {
 
           {
             prop: 'batchNo',
-            label: '批号',
+            label: '批次号',
             align: 'center',
             minWidth: 100,
             showOverflowTooltip: true

src/views/produce/components/picking/index.vue

@@ -46,7 +46,7 @@
               <div class="content">{{ item.productName }}</div>
             </div>
             <div class="col">
-              <div class="name">批号</div>
+              <div class="name">批次号</div>
               <div class="content">{{ item.batchNo }}</div>
             </div>
             <div class="col pd6">

src/views/produce/components/picking/pickingList.vue

@@ -241,7 +241,7 @@
           },
           {
             prop: 'manualBatchNo',
-            label: '批号',
+            label: '批次号',
             align: 'center'
           },
           {

src/views/produce/components/picking/pickingListSearch.vue

@@ -57,7 +57,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="批号:" prop="manualBatchNo">
+        <el-form-item label="批次号:" prop="manualBatchNo">
           <el-input
             clearable
             v-model="where.manualBatchNo"

src/views/produce/components/produceOrder.vue

@@ -82,7 +82,7 @@
           },
           {
             prop: 'batchNo',
-            label: '批号',
+            label: '批次号',
             align: 'center'
           },
 

src/views/produceOrder/index.vue

@@ -312,7 +312,7 @@
           },
           {
             prop: 'batchNo',
-            label: '批号',
+            label: '批次号',
             align: 'center',
             minWidth: 100,
             showOverflowTooltip: true

src/views/produceWord/index.vue

@@ -156,7 +156,7 @@
 
           {
             prop: 'batchNo',
-            label: '批号',
+            label: '批次号',
             align: 'center',
             minWidth: 100,
             showOverflowTooltip: true

src/views/unacceptedProduct/components/create.vue

@@ -57,7 +57,7 @@
           </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-          <el-form-item label="批号:">
+          <el-form-item label="批次号:">
             <el-input :maxlength="20" v-model="form.batchNo" disabled />
           </el-form-item>
         </el-col>

src/views/unacceptedProduct/components/probationalGoods-search.vue

@@ -17,7 +17,7 @@
         </el-form-item>
       </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6}">
-        <el-form-item label="批号:">
+        <el-form-item label="批次号:">
           <el-input
             clearable
             v-model="where.batchNo"

src/views/unacceptedProduct/components/rework-search.vue

@@ -17,7 +17,7 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4}">
-        <el-form-item label="批号:">
+        <el-form-item label="批次号:">
           <el-input
             clearable
             v-model="where.batchNo"

src/views/unacceptedProduct/components/salesToProduction.vue

@@ -79,15 +79,15 @@
               </el-form-item>
             </el-col>
             <el-col v-bind="styleResponsive ? { lg: 3, md: 12 } : { span: 3 }">
-              <el-form-item label="原批号:">{{ form.oldBatchNo }}</el-form-item>
+              <el-form-item label="原批次号:">{{ form.oldBatchNo }}</el-form-item>
             </el-col>
             <el-col v-bind="styleResponsive ? { lg: 3, md: 12 } : { span: 3 }">
-              <el-form-item label="批号:" prop="batchNo">
+              <el-form-item label="批次号:" prop="batchNo">
                 <el-input
                   v-model.number="form.batchNo"
                   size="small"
                   style="width: 100%"
-                  placeholder="请输入批号"
+                  placeholder="请输入批次号"
                 ></el-input>
               </el-form-item>
             </el-col>

src/views/unacceptedProduct/detail.vue

@@ -136,7 +136,7 @@ export default {
         },
         {
           prop: 'batchNo',
-          label: '批号',
+          label: '批次号',
           align: 'center'
         },
         {

src/views/unacceptedProduct/index.vue

@@ -101,7 +101,7 @@
           },
           {
             prop: 'batchNo',
-            label: '批号',
+            label: '批次号',
             align: 'center'
           },
           {

src/views/unacceptedProduct/probationalGoods/index.vue

@@ -120,7 +120,7 @@ export default {
         },
         {
           prop: 'batchNo',
-          label: '批号',
+          label: '批次号',
           align: 'center'
         },
         {
@@ -241,7 +241,7 @@ export default {
         return;
       }
       if (!isBatchNo) {
-        this.$message.error('批号不一致！');
+        this.$message.error('批次号不一致！');
         return;
       }
       this.$refs.salesToProductionRef.open(this.selection,type);

src/views/unacceptedProduct/refuseManagement/index.vue

@@ -120,7 +120,7 @@ export default {
         },
         {
           prop: 'batchNo',
-          label: '批号',
+          label: '批次号',
           align: 'center'
         },
         {
@@ -241,7 +241,7 @@ export default {
         return;
       }
       if (!isBatchNo) {
-        this.$message.error('批号不一致！');
+        this.$message.error('批次号不一致！');
         return;
       }
       this.$refs.salesToProductionRef.open(this.selection,type);

src/views/unacceptedProduct/rework/index.vue

@@ -134,7 +134,7 @@ export default {
         },
         {
           prop: 'batchNo',
-          label: '批号',
+          label: '批次号',
           align: 'center'
         },
         {
@@ -271,7 +271,7 @@ export default {
         return;
       }
       if (!isBatchNo) {
-        this.$message.error('批号不一致！');
+        this.$message.error('批次号不一致！');
         return;
       }
       this.$refs.salesToProductionRef.open(this.selection,type);

src/views/warehousing/storageComponents/storage.vue

@@ -158,7 +158,7 @@
                     <template v-else>{{ row[item.prop] }}</template>
                   </template>
                 </el-table-column>
-                <el-table-column label="批号" width="100" prop="assetName">
+                <el-table-column label="批次号" width="100" prop="assetName">
                   <template slot-scope="{ row, $index }">
                     <template>
                       {{ row.manualBatchNo }}
@@ -442,7 +442,7 @@
                 :show-overflow-tooltip="true"
               ></el-table-column>
               <el-table-column
-                label="批号"
+                label="批次号"
                 prop="manualBatchNo"
                 width="100"
               ></el-table-column>
@@ -553,7 +553,7 @@
                 :show-overflow-tooltip="true"
               ></el-table-column>
               <el-table-column
-                label="批号"
+                label="批次号"
                 prop="manualBatchNo"
                 width="100"
               ></el-table-column>
@@ -1134,7 +1134,7 @@ export default {
         }
       });
 
-      // 添加包装批号丶包装编码丶包装数量
+      // 添加包装批次号丶包装编码丶包装数量
       const onlyCodeList = await outin.getAssetNum({
         assetCode: list.detailList[0].categoryCode,
         batchNum: batchNo,