商品包装单位字典统一

src/utils/dict.js

@@ -89,7 +89,7 @@ export const DICT_TYPE = {
   ECW_COOPERATION_TYPE: 'cooperation_type', // 合作类型
   ECW_SHIPPING_DECLARATION_TYPE: 'shipping_declaration_type', // 出货报关方式（与订单报关方式相同）
   ECW_CUSTOMS_TYPE: 'customs_type', //  订单报关方式（非出货报关），优惠券中的单证报关
-  ECW_PACKAGE_TYPE: 'packageType', // 包装单位
+  // ECW_PACKAGE_TYPE: 'packageType', // 包装单位
   ECW_DOUBLE_CLEAR: 'double_clear', // 是否双清
   ECW_TRADE_TYPE: 'trade_type', // 交货放肆
   ECW_OFFER_RESULT: 'offer_result', //  报单结果 赢单 输单

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -243,7 +243,7 @@
                 </el-table-column>
                 <el-table-column label="包装类型" align="center" prop="">
                   <template slot-scope="scope">
-                    <dict-tag :type="DICT_TYPE.ECW_PACKAGE_TYPE" :value="scope.row.unit" />
+                    <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="scope.row.unit" />
                   </template>
                 </el-table-column>
                 <el-table-column label="材质" align="center" prop="material">、

src/views/ecw/offer/detail.vue

@@ -105,7 +105,7 @@
                 <el-table-column :label="$t('件数')" width="90px" prop="num" />
                 <el-table-column :label="$t('包装单位')">
                   <template slot-scope="scope">
-                      <dict-tag :value="scope.row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" defaultable />
+                      <dict-tag :value="scope.row.unit" :type="DICT_TYPE.ECW_PACKAGING_TYPE" defaultable />
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('箱规(m)')" width="120px" prop="boxGauge" />

src/views/ecw/offer/edit.vue

@@ -182,7 +182,7 @@
               </el-table-column>
               <el-table-column :label="$t('包装单位')">
                 <template slot-scope="{row}">
-                    <dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" defaultable @input="calculationPrice" :disabled="!canAddProduct" />
+                    <dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGING_TYPE" defaultable @input="calculationPrice" :disabled="!canAddProduct" />
                 </template>
               </el-table-column>
               <el-table-column :label="$t('数量') + '(个)'">

src/views/ecw/offer/special.vue

@@ -40,7 +40,7 @@
         <el-table-column
           :label="$t('包装')">
           <template v-slot="{row}">
-            <dict-tag :value="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" />
+            <dict-tag :value="row.unit" :type="DICT_TYPE.ECW_PACKAGING_TYPE" />
           </template>
         </el-table-column>
 

src/views/ecw/order/detail.vue

@@ -117,7 +117,7 @@
             </el-table-column>
             <el-table-column prop="unit" :label="$t('单位')" width="90px">
               <template slot-scope="{row}">
-                <dict-tag :type="DICT_TYPE.ECW_PACKAGE_TYPE" :value="row.unit" />
+                <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="row.unit" />
               </template>
             </el-table-column>
 

src/views/ecw/order/edit.vue

@@ -146,7 +146,7 @@
               </el-table-column>
               <el-table-column :label="$t('包装单位')">
                 <template slot-scope="{row}">
-                    <dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" defaultable :disabled="!canAddProduct || !productEditable" />
+                    <dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGING_TYPE" defaultable :disabled="!canAddProduct || !productEditable" />
                 </template>
               </el-table-column>
               <el-table-column :label="$t('数量') + '(个)'" width="120px">

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -64,10 +64,10 @@
                     <el-form-item :rules="tableFormRules.cartonsNum" :prop="$index + '.cartonsNum'">
                       <span v-if="tableData[$index].id && !edit">
                         {{ tableData[$index].cartonsNum }}
-                        {{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}
+                        {{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData[$index].unit) }}
                       </span>
                       <el-input v-else v-model="tableData[$index].cartonsNum" placeholder="">
-                        <span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}</span>
+                        <span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData[$index].unit) }}</span>
                       </el-input>
                     </el-form-item>
                   </template>
@@ -75,8 +75,8 @@
                 <el-table-column label="包装类型" width="100px">
                   <template v-slot="{r,c,$index}">
                     <el-form-item>
-                      <span v-if="tableData[$index].id && !edit">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}</span>
-                      <dict-selector v-else :type="DICT_TYPE.ECW_PACKAGE_TYPE" v-model="tableData[$index].unit"></dict-selector>
+                      <span v-if="tableData[$index].id && !edit">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData[$index].unit) }}</span>
+                      <dict-selector v-else :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="tableData[$index].unit"></dict-selector>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -195,10 +195,10 @@
                     <el-form-item  :rules="tableFormRules.cartonsNum" :prop="$index + '.cartonsNum'">
                       <span v-if="tableData1[$index].id">
                         {{ tableData1[$index].cartonsNum }}
-                        {{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData1[$index].unit) }}
+                        {{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData1[$index].unit) }}
                       </span>
                       <el-input v-else v-model="tableData1[$index].cartonsNum" placeholder="">
-                        <span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData1[$index].unit) }}</span>
+                        <span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData1[$index].unit) }}</span>
                       </el-input>
                     </el-form-item>
                   </template>
@@ -206,8 +206,8 @@
                 <el-table-column label="包装类型" width="100px">
                   <template v-slot="{r,c,$index}">
                     <el-form-item>
-                      <span v-if="tableData1[$index].id">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData1[$index].unit) }}</span>
-                      <dict-selector v-else :type="DICT_TYPE.ECW_PACKAGE_TYPE" v-model="tableData1[$index].unit"></dict-selector>
+                      <span v-if="tableData1[$index].id">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, tableData1[$index].unit) }}</span>
+                      <dict-selector v-else :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="tableData1[$index].unit"></dict-selector>
                     </el-form-item>
                   </template>
                 </el-table-column>