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

zuozhengqing

2023-10-28 d697d5ce65a3b43cbcd3db9d0955340cb8219c4e

 src/views/warehouseManage/listingRules/index.vue

@@ -124,8 +124,8 @@
          const list = res.data.map((item) => {
            return {
              ...item,
              areaName: {label:item.area.jointName,value:item.area.id},
              subLocation: {label:item.location.jointName,value:item.location.id},
              areaName: { label: item.area.jointName, value: item.area.id },
              subLocation: { label: item.location.jointName, value: item.location.id },
              productName: item.product.name,
              productCategory: item.productCategory.name,
              isSet: false,
@@ -169,7 +169,8 @@
          productName: "",
          companyName: "",
          isSet: true,
          isEdit: false
          isEdit: false,
          isOrder: true
        })
        this.areaId = 0
        this.subLocationId = 0
@@ -289,6 +290,7 @@
        this.tableData.map((item, index) => {
          if (index === rowIndex) {
            item.isEdit = false
            item.isOrder = true
          } else {
            item.isEdit = true
          }