Merge branch '外箱包装功能修改' into 测试

src/views/group/order/management/index.vue

@@ -90,7 +90,7 @@
         <el-form :model="formData.data" :rules="rulesShippingPackage" ref="shippingPackage">
           <div style="font-weight: 700; margin: 20px 0 10px 0">发货包装</div>
           <div style="margin-bottom: 10px">
-            <el-button type="primary" size="small" @click="clickExpressPacking()">选择快递物流包材</el-button>
+            <el-button type="primary" size="small" @click="clickExpressPacking()">选择包材</el-button>
           </div>
           <el-table :data="formData.data.orderPackageBomList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
             <el-table-column label="品号" prop="code" width="160" />

src/views/production/schedule/order-inquiry/index.vue

@@ -35,7 +35,7 @@
         <el-form :model="formData.data" :rules="rulesShippingPackage" ref="shippingPackage">
           <div style="font-weight: 700; margin: 20px 0 10px 0">发货包装</div>
           <div style="margin-bottom: 10px">
-            <el-button type="primary" size="small" @click="clickExpressPacking()">选择快递物流包材</el-button>
+            <el-button type="primary" size="small" @click="clickExpressPacking()">选择包材</el-button>
           </div>
           <el-table :data="formData.data.orderPackageBomList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
             <el-table-column label="品号" prop="code" width="160" />

src/views/subsidiary/order/management/add.vue

@@ -421,7 +421,7 @@
         <el-form :model="formData.data" :rules="rulesShippingPackage" ref="shippingPackage">
           <div style="font-weight: 700; margin: 20px 0 10px 0">发货包装</div>
           <div style="margin-bottom: 10px">
-            <el-button type="primary" size="small" @click="clickExpressPacking()">选择快递物流包材</el-button>
+            <el-button type="primary" size="small" @click="clickExpressPacking()">选择包材</el-button>
           </div>
           <el-table :data="formData.data.orderPackageBomList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
             <el-table-column label="品号" prop="code" width="160" />

src/views/subsidiary/order/management/design.vue

@@ -330,7 +330,7 @@
         <el-form :model="formData.data" :rules="rulesShippingPackage" ref="shippingPackage">
           <div style="font-weight: 700; margin: 20px 0 10px 0">发货包装</div>
           <div style="margin-bottom: 10px">
-            <el-button type="primary" size="small" @click="clickExpressPacking()">选择快递物流包材</el-button>
+            <el-button type="primary" size="small" @click="clickExpressPacking()">选择包材</el-button>
           </div>
           <el-table :data="formData.data.orderPackageBomList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
             <el-table-column label="品号" prop="code" width="160" />