出入库调整

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

@@ -93,12 +93,9 @@ const config = computed(() => {
     {
       attrs: {
         label: "仓库名称",
-        prop: "warehouseId",
+        prop: "warehouseName",
         width: 220,
       },
-      render(type) {
-        return proxy.dictValueLabel(type, warehouseList.value);
-      },
     },
     {
       attrs: {
@@ -138,7 +135,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "操作人",
-        prop: "userName",
+        prop: "opUserName",
         width: 140,
       },
     },

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

@@ -93,12 +93,9 @@ const config = computed(() => {
     {
       attrs: {
         label: "仓库名称",
-        prop: "warehouseId",
+        prop: "warehouseName",
         width: 220,
       },
-      render(type) {
-        return proxy.dictValueLabel(type, warehouseList.value);
-      },
     },
     {
       attrs: {
@@ -138,7 +135,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "操作人",
-        prop: "userName",
+        prop: "opUserName",
         width: 140,
       },
     },

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

@@ -145,12 +145,9 @@ const config = computed(() => {
     {
       attrs: {
         label: "仓库名称",
-        prop: "warehouseId",
+        prop: "warehouseName",
         width: 220,
       },
-      render(type) {
-        return proxy.dictValueLabel(type, warehouseList.value);
-      },
     },
     {
       attrs: {
@@ -190,7 +187,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "操作人",
-        prop: "userName",
+        prop: "opUserName",
         width: 120,
       },
     },

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

@@ -106,22 +106,22 @@ const config = computed(() => {
     {
       attrs: {
         label: "调出仓库",
-        prop: "warehouseId",
+        prop: "warehouseName",
         width: 220,
       },
-      render(type) {
-        return proxy.dictValueLabel(type, warehouseList.value);
-      },
+      // render(type) {
+      //   return proxy.dictValueLabel(type, warehouseList.value);
+      // },
     },
     {
       attrs: {
         label: "调出仓库",
-        prop: "toWarehouseId",
+        prop: "toWarehouseName",
         width: 220,
       },
-      render(type) {
-        return proxy.dictValueLabel(type, warehouseList.value);
-      },
+      // render(type) {
+      //   return proxy.dictValueLabel(type, warehouseList.value);
+      // },
     },
     {
       attrs: {
@@ -161,7 +161,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "操作人",
-        prop: "userName",
+        prop: "opUserName",
         width: 140,
       },
     },