Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/utils/dict.js

@@ -193,6 +193,7 @@ export const DICT_TYPE = {
   MANUAL_EXCEPTION_TYPE:'manual_exception_type',
   APPLY_STATUS:'apply_status',//特价申请审核状态
   WAREHOUSING_SPECIFICATION_TYPE: 'warehousing_specification_type',
+  WAREHOUSING_RECORD_DETAIL_USAGE: 'warehousing_record_detail_usage', // 入仓规格类型
   ECW_AUTH_TYPE:'auth_type',//品牌授权
   OREER_ITEM_USAGE:'order_item_usage',//用途
 

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

@@ -122,6 +122,7 @@ export default {
     },
     handleSave() {
       this.$emit('input', this.dataList)
+      this.dialogVisible = false
     }
   },
 

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

@@ -40,6 +40,12 @@
       </el-col>
       <el-col :span="12">
         <el-form-item :label="$t('用途')">
+          <dict-selector
+            v-model="value.usageIds"
+            :type="DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE"
+            multiple
+            form-type="checkbox"
+          ></dict-selector>
         </el-form-item>
       </el-col>
     </el-row>
@@ -70,6 +76,23 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-row :gutter="10">
+      <el-col :span="4">
+        <el-form-item :label="$t('快递单号')">
+          <el-input v-model="value.expressNo" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="4">
+        <el-form-item :label="$t('包装类型')">
+          <dict-selector :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="value.unit"></dict-selector>
+        </el-form-item>
+      </el-col>
+      <el-col :span="4">
+        <el-form-item :label="$t('数量')">
+          <el-input v-model="value.quantityAll" />
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-card>
 </template>