出入库,产品字段调整

src/views/purchaseSales/outAndInWarehouse/inventoryInquiry/index.vue

@@ -75,21 +75,21 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品名称",
-        slot: "productName",
+        prop: "productName",
         "min-width": 220,
       },
     },
     {
       attrs: {
         label: "规格型号",
-        prop: "productModel",
+        prop: "productSpec",
         width: 160,
       },
     },
     {
       attrs: {
         label: "单位",
-        prop: "unit",
+        prop: "productUnit",
         width: 120,
       },
     },

src/views/purchaseSales/outAndInWarehouse/manualDelivery/index.vue

@@ -24,10 +24,10 @@
           <div style="width: 100%">
             <el-button type="primary" @click="openProduct = true">添加明细</el-button>
             <el-table :data="formData.data.list" style="width: 100%; margin-top: 16px">
-              <el-table-column prop="code" label="产品编码" width="140" />
+              <el-table-column prop="productCode" label="产品编码" width="140" />
               <el-table-column prop="productName" label="产品名称" min-width="220" />
-              <el-table-column prop="productModel" label="规格型号" min-width="220" />
-              <el-table-column prop="unit" label="单位" width="100" />
+              <el-table-column prop="productSpec" label="规格型号" min-width="220" />
+              <el-table-column prop="productUnit" label="单位" width="100" />
               <el-table-column label="数量" width="160">
                 <template #default="{ row, $index }">
                   <div style="width: 100%">
@@ -110,21 +110,21 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品名称",
-        slot: "productName",
+        prop: "productName",
         "min-width": 220,
       },
     },
     {
       attrs: {
         label: "规格型号",
-        prop: "productModel",
+        prop: "productSpec",
         width: 160,
       },
     },
     {
       attrs: {
         label: "单位",
-        prop: "unit",
+        prop: "productUnit",
         width: 120,
       },
     },
@@ -224,11 +224,11 @@ const pushGoods = (goods) => {
     formData.data.list = formData.data.list.concat(
       goods.map((item) => {
         return {
-          code: item.code,
+          productCode: item.code,
           productId: item.id,
           productName: item.name,
-          productModel: item.spec,
-          unit: item.unit,
+          productSpec: item.spec,
+          productUnit: item.unit,
           quantity: undefined,
         };
       })

src/views/purchaseSales/outAndInWarehouse/manualWarehousing/index.vue

@@ -24,10 +24,10 @@
           <div style="width: 100%">
             <el-button type="primary" @click="openProduct = true">添加明细</el-button>
             <el-table :data="formData.data.list" style="width: 100%; margin-top: 16px">
-              <el-table-column prop="code" label="产品编码" width="140" />
+              <el-table-column prop="productCode" label="产品编码" width="140" />
               <el-table-column prop="productName" label="产品名称" min-width="220" />
-              <el-table-column prop="productModel" label="规格型号" min-width="220" />
-              <el-table-column prop="unit" label="单位" width="100" />
+              <el-table-column prop="productSpec" label="规格型号" min-width="220" />
+              <el-table-column prop="productUnit" label="单位" width="100" />
               <el-table-column label="入库数量" width="160">
                 <template #default="{ row, $index }">
                   <div style="width: 100%">
@@ -110,21 +110,21 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品名称",
-        slot: "productName",
+        prop: "productName",
         "min-width": 220,
       },
     },
     {
       attrs: {
         label: "规格型号",
-        prop: "productModel",
+        prop: "productSpec",
         width: 160,
       },
     },
     {
       attrs: {
         label: "单位",
-        prop: "unit",
+        prop: "productUnit",
         width: 120,
       },
     },
@@ -224,11 +224,11 @@ const pushGoods = (goods) => {
     formData.data.list = formData.data.list.concat(
       goods.map((item) => {
         return {
-          code: item.code,
+          productCode: item.code,
           productId: item.id,
           productName: item.name,
-          productModel: item.spec,
-          unit: item.unit,
+          productSpec: item.spec,
+          productUnit: item.unit,
           quantity: undefined,
         };
       })

src/views/purchaseSales/outAndInWarehouse/record/index.vue

@@ -112,21 +112,21 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品名称",
-        slot: "productName",
+        prop: "productName",
         "min-width": 220,
       },
     },
     {
       attrs: {
         label: "规格型号",
-        prop: "productModel",
+        prop: "productSpec",
         width: 160,
       },
     },
     {
       attrs: {
         label: "单位",
-        prop: "unit",
+        prop: "productUnit",
         width: 120,
       },
     },

src/views/purchaseSales/outAndInWarehouse/waitingForDelivery/index.vue

@@ -84,14 +84,14 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品类型",
-        prop: "aaaaaaa",
+        prop: "productType",
         width: 120,
       },
     },
     {
       attrs: {
         label: "物品编码",
-        prop: "code",
+        prop: "productCode",
         width: 140,
       },
     },
@@ -105,14 +105,14 @@ const config = computed(() => {
     {
       attrs: {
         label: "规格型号",
-        prop: "productModel",
+        prop: "productSpec",
         width: 140,
       },
     },
     {
       attrs: {
         label: "单位",
-        prop: "unit",
+        prop: "productUnit",
         width: 120,
       },
     },

src/views/purchaseSales/outAndInWarehouse/waitingForStorage/index.vue

@@ -84,14 +84,14 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品类型",
-        prop: "aaaaaaa",
+        prop: "productType",
         width: 120,
       },
     },
     {
       attrs: {
         label: "物品编码",
-        prop: "code",
+        prop: "productCode",
         width: 140,
       },
     },
@@ -105,14 +105,14 @@ const config = computed(() => {
     {
       attrs: {
         label: "规格型号",
-        prop: "productModel",
+        prop: "productSpec",
         width: 140,
       },
     },
     {
       attrs: {
         label: "单位",
-        prop: "unit",
+        prop: "productUnit",
         width: 120,
       },
     },
@@ -182,7 +182,6 @@ const getList = async (req) => {
 };
 getDict();
 getList();
-const modalType = ref("add");
 const dialogVisible = ref(false);
 const loadingDialog = ref(false);
 const submit = ref(null);

src/views/purchaseSales/outAndInWarehouse/warehouseAdjustment/index.vue

@@ -24,10 +24,10 @@
           <div style="width: 100%">
             <el-button type="primary" @click="openProduct = true">添加明细</el-button>
             <el-table :data="formData.data.list" style="width: 100%; margin-top: 16px">
-              <el-table-column prop="code" label="产品编码" width="140" />
+              <el-table-column prop="productCode" label="产品编码" width="140" />
               <el-table-column prop="productName" label="产品名称" min-width="220" />
-              <el-table-column prop="productModel" label="规格型号" min-width="220" />
-              <el-table-column prop="unit" label="单位" width="100" />
+              <el-table-column prop="productSpec" label="规格型号" min-width="220" />
+              <el-table-column prop="productUnit" label="单位" width="100" />
               <el-table-column label="入库数量" width="160">
                 <template #default="{ row, $index }">
                   <div style="width: 100%">
@@ -133,21 +133,21 @@ const config = computed(() => {
     {
       attrs: {
         label: "物品名称",
-        slot: "productName",
+        prop: "productName",
         "min-width": 220,
       },
     },
     {
       attrs: {
         label: "规格型号",
-        prop: "productModel",
+        prop: "productSpec",
         width: 160,
       },
     },
     {
       attrs: {
         label: "单位",
-        prop: "unit",
+        prop: "productUnit",
         width: 120,
       },
     },
@@ -262,11 +262,11 @@ const pushGoods = (goods) => {
     formData.data.list = formData.data.list.concat(
       goods.map((item) => {
         return {
-          code: item.code,
+          productCode: item.code,
           productId: item.id,
           productName: item.name,
-          productModel: item.spec,
-          unit: item.unit,
+          productSpec: item.spec,
+          productUnit: item.unit,
           quantity: undefined,
         };
       })