Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

haoxuan

2023-10-18 2343229e4edc41648fcd0589490f5bdf486fe3ae

Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

 src/api/data.js

@@ -100,20 +100,28 @@
// 强制下架策略
const forceRemovalStrategy = [
  {
    name: "First In First Out (FIFO)",
    name: "请选择",
    id: 0
  },
  {
    name: "先进先出",
    id: 1
  },
  {
    name: "Last In First Out (LIFO)",
    name: "先进后出",
    id: 2
  },
  {
    name: "Closest Location",
    name: "无规则随机出",
    id: 3
  }
]
//成本方法
const costingMethod = [
  {
    name: "请选择",
    id: 0
  },
  {
    name: "标准价格",
    id: 1
@@ -130,6 +138,10 @@
// 库存计价
const inventoryValuation = [
  {
    name: "请选择",
    id: 0
  },
  {
    name: "手动",
    id: 1
  },

 src/views/productManage/productCategory/AddProductCategoryDialog.vue

@@ -88,7 +88,7 @@
                    style="width: 85%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in productCategoryList" :key="item.id" :label="item.name" :value="item.id">
                    <el-option v-for="item in productCategoryListWithDefault" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -195,7 +195,12 @@
    }
  },
  components: {},
  computed: {},
  computed: {
    productCategoryListWithDefault(){
      console.log(this.productCategoryList)
      return [{id:0,name:'请选择'},...(this.productCategoryList?? [])]
    }
  },
  data() {
    return {
      dialogWidth: "50%",