待出入库，调仓接口替换

src/views/purchase-sales/inbound-outbound/transferWarehouse/add.vue

@@ -10,7 +10,7 @@
     <van-form @submit="onSubmit" label-align="top" style="margin-top: 20px">
       <van-cell-group inset>
         <van-field
-          v-model="formData.warehouseName"
+          v-model="formData.outWarehouseIdName"
           is-link
           readonly
           label="调出仓库"
@@ -20,7 +20,7 @@
           required
         />
         <van-field
-          v-model="formData.toWarehouseName"
+          v-model="formData.inWarehouseIdName"
           is-link
           readonly
           label="调入仓库"
@@ -60,7 +60,7 @@
           />
 
           <van-field
-            v-model="list[index].quantity"
+            v-model="list[index].outQuantity"
             label="出库数量"
             placeholder="请输入出库数量"
             :rules="[{ required: true, message: '出库数量不能为空' }]"
@@ -76,11 +76,10 @@
         </van-popup>
       </van-cell-group>
 
-      <div class="commons-add-btn"  v-if="!route.query.id">
+      <div class="commons-add-btn" v-if="!route.query.id">
         <van-button
           icon="plus"
           type="default"
-          
           size="small"
           style="margin-top: 10px"
           block
@@ -112,27 +111,28 @@ let selectIndex = ref(null);
 let isTo = ref(false);
 
 const formData = ref({
-  warehouseId: "",
-  warehouseName: "",
-  toWarehouseId: "",
-  toWarehouseName: "",
+  outWarehouseId: "",
+  outWarehouseIdName: "",
+  inWarehouseId: "",
+  inWarehouseIdName: "",
 });
 const list = ref([]);
 const handleAddRow = () => {
   list.value.push({
     productId: "",
     productName: "",
-    quantity: "",
+    outQuantity: "",
   });
 };
-const getDetails = (id) => {
-  proxy.post("/stockJournal/detail", { id }).then((res) => {
-    console.log(res, "www");
+const getDetails = (row) => {
+  proxy.post("stockTransfer/detail", { id: row.id }).then((res) => {
     formData.value = res.data;
-    list.value = res.data.list.map((x) => ({
+    formData.value.outWarehouseIdName = row.outWarehouseName;
+    formData.value.inWarehouseIdName = row.inWarehouseName;
+    list.value = res.data.stockTransferDetailsList.map((x) => ({
       productId: x.productId,
       productName: x.productName,
-      quantity: x.quantity,
+      outQuantity: x.outQuantity,
     }));
   });
 };
@@ -145,8 +145,8 @@ const getDict = () => {
         value: item.id,
       };
     });
-    // formData.value.warehouseName = formData.value.warehouseId
-    //   ? columns.value.find((item) => item.value == formData.value.warehouseId).name
+    // formData.value.outWarehouseIdName = formData.value.outWarehouseId
+    //   ? columns.value.find((item) => item.value == formData.value.outWarehouseId).name
     //   : null;
   });
 
@@ -159,8 +159,8 @@ const getDict = () => {
           value: item.id,
         };
       });
-      // formData.value.warehouseName = formData.value.warehouseId
-      //   ? columns.value.find((item) => item.value == formData.value.warehouseId).name
+      // formData.value.outWarehouseIdName = formData.value.outWarehouseId
+      //   ? columns.value.find((item) => item.value == formData.value.outWarehouseId).name
       //   : null;
     });
 };
@@ -170,17 +170,17 @@ const columnsOne = ref([]);
 
 const onConfirm = ({ selectedOptions }) => {
   if (isTo.value) {
-    if (formData.value.toWarehouseId === selectedOptions[0].value) {
+    if (formData.value.inWarehouseId === selectedOptions[0].value) {
       return showFailToast("仓库不可相同！");
     }
-    formData.value.toWarehouseId = selectedOptions[0].value;
-    formData.value.toWarehouseName = selectedOptions[0].text;
+    formData.value.inWarehouseId = selectedOptions[0].value;
+    formData.value.inWarehouseIdName = selectedOptions[0].text;
   } else {
-    if (formData.value.toWarehouseId === selectedOptions[0].value) {
+    if (formData.value.inWarehouseId === selectedOptions[0].value) {
       return showFailToast("仓库不可相同！");
     }
-    formData.value.warehouseId = selectedOptions[0].value;
-    formData.value.warehouseName = selectedOptions[0].text;
+    formData.value.outWarehouseId = selectedOptions[0].value;
+    formData.value.outWarehouseIdName = selectedOptions[0].text;
   }
 
   typeModal.value = false;
@@ -210,12 +210,12 @@ const onClickLeft = () => history.back();
 
 const onSubmit = () => {
   if (!list.value.length > 0) return showFailToast("请添加明细！");
-  formData.value.list = list.value.map((x) => ({
+  formData.value.stockTransferDetailsList = list.value.map((x) => ({
     productId: x.productId,
-    quantity: x.quantity,
+    outQuantity: x.outQuantity,
   }));
   // formData.value.type = "2";
-  proxy.post("/stock/stockTransfer", formData.value).then(
+  proxy.post("/stockTransfer/addSt", formData.value).then(
     (res) => {
       setTimeout(() => {
         showSuccessToast("调仓成功");
@@ -228,7 +228,9 @@ const onSubmit = () => {
   );
 };
 onMounted(() => {
-  if(route.query.id) getDetails(route.query.id);
+  if (route.query.id) {
+    getDetails(route.query);
+  }
   getDict();
 });
 </script>

src/views/purchase-sales/inbound-outbound/transferWarehouse/index.vue

@@ -49,15 +49,15 @@ const listData = ref([]);
 const listConfig = ref([
   {
     label: "调出仓库",
-    prop: "warehouseName",
+    prop: "outWarehouseName",
   },
   {
     label: "调入仓库",
-    prop: "toWarehouseName",
+    prop: "inWarehouseName",
   },
   {
     label: "操作人",
-    prop: "userName",
+    prop: "outUserName",
   },
 ]);
 const onRefresh = () => {
@@ -74,13 +74,13 @@ const onClickLeft = () => proxy.$router.push("/main/working");
 const onClickRight = () => {
   proxy.$router.push("/main/sendTransferWarehouse");
 };
-proxy.uploadDdRightBtn(onClickRight,'添加')
+proxy.uploadDdRightBtn(onClickRight, "添加");
 const toDtl = (row) => {
   console.log(row);
   proxy.$router.push({
     path: "sendTransferWarehouse",
     query: {
-      id: row.id,
+      ...row,
     },
   });
 };
@@ -88,7 +88,7 @@ const toDtl = (row) => {
 const getList = (type) => {
   loading.value = true;
   proxy
-    .post("/stockJournal/page", req.value)
+    .post("stockTransfer/page", req.value)
     .then((res) => {
       console.log(req.value);
       listData.value =

src/views/purchase-sales/inbound-outbound/waitInbound/add.vue

@@ -9,7 +9,11 @@
     </van-nav-bar>
     <van-form @submit="onSubmit" label-align="top" style="margin-top: 20px">
       <van-cell-group inset>
-        <van-field v-model="formData.businessType" readonly label="数据来源" />
+        <van-field
+          v-model="formData.businessTypeName"
+          readonly
+          label="数据来源"
+        />
         <van-field v-model="formData.businessCode" readonly label="单号" />
         <van-field v-model="formData.productName" readonly label="物品名称" />
         <van-field v-model="formData.inQuantity" readonly label="待入库数量" />
@@ -89,7 +93,12 @@ const onConfirm = ({ selectedOptions }) => {
 const onClickLeft = () => history.back();
 
 const onSubmit = () => {
-  proxy.post("/stockWait/add", formData.value).then(
+  const data = {
+    id: formData.value.id,
+    warehouseId: formData.value.warehouseId,
+    quantity: formData.value.quantity,
+  };
+  proxy.post("/stockWait/add", data).then(
     (res) => {
       setTimeout(() => {
         showSuccessToast("入库成功");
@@ -103,7 +112,10 @@ const onSubmit = () => {
 };
 
 onMounted(() => {
-  getDetails(route.query.id);
+  if (route.query) {
+    formData.value = { ...route.query };
+    formData.value.inQuantity = formData.value.quantity;
+  }
   getDict();
 });
 </script>

src/views/purchase-sales/inbound-outbound/waitInbound/index.vue

@@ -44,7 +44,7 @@ const listData = ref([]);
 const listConfig = ref([
   {
     label: "数据来源",
-    prop: "businessType",
+    prop: "businessTypeName",
   },
   {
     label: "物品名称",
@@ -74,21 +74,55 @@ const toDtl = (row) => {
   proxy.$router.push({
     path: "waitInboundAdd",
     query: {
-      id: row.id,
+      ...row,
     },
   });
 };
+const businessType = ref([
+  {
+    label: "线边回仓",
+    value: 1,
+  },
+  {
+    label: "完工入库",
+    value: 2,
+  },
+  {
+    label: "采购到货",
+    value: 3,
+  },
+  {
+    label: "退货出库",
+    value: 4,
+  },
+  {
+    label: "京东订单",
+    value: 5,
+  },
+  {
+    label: "销售订单出库",
+    value: 6,
+  },
+]);
 
 const getList = (type) => {
   loading.value = true;
   proxy
-    .post("/stockWait/page", req.value)
+    .post("/stockWaitDetails/page", req.value)
     .then((res) => {
       console.log(req.value);
       listData.value =
         type === "refresh"
           ? res.data.rows
           : listData.value.concat(res.data.rows);
+      listData.value.forEach((x) => {
+        const current = businessType.value.find(
+          (v) => v.value == x.businessType
+        );
+        if (current) {
+          x.businessTypeName = current.label;
+        }
+      });
       if (req.value.pageNum * 10 >= res.data.total) {
         finished.value = true;
       }

src/views/purchase-sales/inbound-outbound/waitOutbound/add.vue

@@ -95,7 +95,12 @@ const onConfirm = ({ selectedOptions }) => {
 const onClickLeft = () => history.back();
 
 const onSubmit = () => {
-  proxy.post("/stockWait/add", formData.value).then(
+  const data = {
+    id: formData.value.id,
+    warehouseId: formData.value.warehouseId,
+    quantity: formData.value.quantity,
+  };
+  proxy.post("/stockWait/add", data).then(
     (res) => {
       setTimeout(() => {
         showSuccessToast("出库成功");
@@ -109,7 +114,10 @@ const onSubmit = () => {
 };
 
 onMounted(() => {
-  getDetails(route.query.id);
+  if (route.query) {
+    formData.value = { ...route.query };
+    formData.value.inQuantity = formData.value.quantity;
+  }
   getDict();
 });
 </script>

src/views/purchase-sales/inbound-outbound/waitOutbound/index.vue

@@ -74,25 +74,59 @@ const toDtl = (row) => {
   proxy.$router.push({
     path: "waitOutboundAdd",
     query: {
-      id: row.id,
+      ...row
     },
   });
 };
+const businessType = ref([
+  {
+    label: "线边回仓",
+    value: 1,
+  },
+  {
+    label: "完工入库",
+    value: 2,
+  },
+  {
+    label: "采购到货",
+    value: 3,
+  },
+  {
+    label: "退货出库",
+    value: 4,
+  },
+  {
+    label: "京东订单",
+    value: 5,
+  },
+  {
+    label: "销售订单出库",
+    value: 6,
+  },
+  {
+    label: "生产任务出库",
+    value: 7,
+  },
+]);
 
 const getList = (type) => {
   loading.value = true;
   proxy
-    .post("/stockWait/page", req.value)
+    .post("/stockWaitDetails/page", req.value)
     .then((res) => {
       console.log(req.value);
       listData.value =
         type === "refresh"
           ? res.data.rows
           : listData.value.concat(res.data.rows);
-      listData.value = listData.value.map((x) => ({
-        ...x,
-        businessTypeName: x.businessType == 6 ? "销售订单出库" : "京东订单出库",
-      }));
+      listData.value.forEach((x) => {
+        const current = businessType.value.find(
+          (v) => v.value == x.businessType
+        );
+        if (current) {
+          x.businessTypeName = current.label;
+        }
+      });
       if (req.value.pageNum * 10 >= res.data.total) {
         finished.value = true;
       }