Merge branch 'master' of http://192.168.1.160:3000/zhaohanlin/rtk-web-wms-cloud

src/api/wms/output/inrequest.js

@@ -57,7 +57,14 @@ export function getInRequest(id) {
         method: "get",
     });
 }
-
+// 获得入库申请主
+export function getStockPage(params) {
+    return request({
+        url: "/rtkerp/stock/page",
+        method: "get",
+        params,
+    });
+}
 // 获得入库申请主分页
 export function getInRequestPage(params) {
     return request({

src/views/rtkwms/inrequest/InRequestForm.vue

@@ -23,7 +23,7 @@
               placeholder="请选择业务类型"
             >
               <el-option
-                v-for="dict in getDictDatas('inout_business_type')"
+                v-for="dict in getDictDatas('in_business_type')"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -135,6 +135,28 @@
               placeholder="请输入备注"
             /> </el-form-item
         ></el-col>
+        <el-col :span="12">
+          <el-form-item label="存储地点" prop="warehouseId">
+            <el-select
+              v-model="formData.warehouseId"
+              filterable
+              remote
+              :disabled="formData.businessType ? false : true"
+              reserve-keyword
+              placeholder="请输入存储地点"
+              :remote-method="remoteWarehouse"
+              :loading="loading"
+            >
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.erpId"
+                :label="item.name"
+                :value="item.erpId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-form>
       <el-table :data="formData.list" border size="mini">
         <el-table-column
@@ -237,6 +259,7 @@ export default {
     return {
       sourceOrderNoList: [],
       businessDescribeList: [],
+      warehouseList: [],
       loading: false,
       // 弹出层标题
       dialogTitle: "",
@@ -338,6 +361,24 @@ export default {
         this.sourceOrderNoList = [];
       }
     },
+    remoteWarehouse(query) {
+      if (query !== "") {
+        let that = this;
+        this.loading = true;
+        setTimeout(async () => {
+          this.loading = false;
+          let {
+            data: { list },
+          } = await InRequestApi.getStockPage({
+            name: query,
+            pageSize: 999,
+          });
+          this.warehouseList = list || [];
+        }, 200);
+      } else {
+        this.warehouseList = [];
+      }
+    },
     changeSourceOrderNo(value) {
       this.sourceOrderNoList.map((v) => {
         if (v.sourceOrderNo == value) {
@@ -397,13 +438,28 @@ export default {
       try {
         // this.$refs.shipmentNotification.open = true;
         const data = this.formData;
-        let arr = [];
-        data.list.filter((v) => {
-          if (v.nowDeliveredQty) {
-            arr.push(v);
-          }
-        });
-        data.list = arr;
+        data.list = data.list
+          .filter((v) => v.nowDeliveredQty)
+          .map(
+            ({
+              completedQty,
+              actualQty,
+              stock_code,
+              area_code,
+              location_code,
+              status,
+              lineNo,
+              inventory_status,
+              ...rest
+            }) => rest
+          );
+        // let arr = [];
+        // data.list.filter((v) => {
+        //   if (v.nowDeliveredQty) {
+        //     arr.push(v);
+        //   }
+        // });
+        // data.list = arr;
         // 修改的提交;
         if (data.id) {
           await InRequestApi.updateRequest(data);

src/views/wms/output/inrequest/components/InRequestForm.vue

@@ -135,6 +135,28 @@
               placeholder="请输入备注"
             /> </el-form-item
         ></el-col>
+        <el-col :span="12">
+          <el-form-item label="存储地点" prop="warehouseId">
+            <el-select
+              v-model="formData.warehouseId"
+              filterable
+              remote
+              :disabled="formData.businessType ? false : true"
+              reserve-keyword
+              placeholder="请输入存储地点"
+              :remote-method="remoteWarehouse"
+              :loading="loading"
+            >
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.erpId"
+                :label="item.name"
+                :value="item.erpId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-form>
       <el-table :data="formData.list" border size="mini">
         <el-table-column
@@ -237,6 +259,7 @@ export default {
     return {
       sourceOrderNoList: [],
       businessDescribeList: [],
+      warehouseList: [],
       loading: false,
       // 弹出层标题
       dialogTitle: "",
@@ -338,6 +361,24 @@ export default {
         this.sourceOrderNoList = [];
       }
     },
+    remoteWarehouse(query) {
+      if (query !== "") {
+        let that = this;
+        this.loading = true;
+        setTimeout(async () => {
+          this.loading = false;
+          let {
+            data: { list },
+          } = await InRequestApi.getStockPage({
+            name: query,
+            pageSize: 999,
+          });
+          this.warehouseList = list || [];
+        }, 200);
+      } else {
+        this.warehouseList = [];
+      }
+    },
     changeSourceOrderNo(value) {
       this.sourceOrderNoList.map((v) => {
         if (v.sourceOrderNo == value) {
@@ -397,13 +438,28 @@ export default {
       try {
         // this.$refs.shipmentNotification.open = true;
         const data = this.formData;
-        let arr = [];
-        data.list.filter((v) => {
-          if (v.nowDeliveredQty) {
-            arr.push(v);
-          }
-        });
-        data.list = arr;
+        data.list = data.list
+          .filter((v) => v.nowDeliveredQty)
+          .map(
+            ({
+              completedQty,
+              actualQty,
+              stock_code,
+              area_code,
+              location_code,
+              status,
+              lineNo,
+              inventory_status,
+              ...rest
+            }) => rest
+          );
+        // let arr = [];
+        // data.list.filter((v) => {
+        //   if (v.nowDeliveredQty) {
+        //     arr.push(v);
+        //   }
+        // });
+        // data.list = arr;
         // 修改的提交;
         if (data.id) {
           await InRequestApi.updateInRequest(data);