From ca6ffc2c9feafbdebc779d10e1b1685ef7f648c3 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Mon, 26 Jun 2023 08:29:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CollectionController.java      |   6 +-
 .../scm/basicInformation/collection/index.vue | 116 +++++++++---------
 2 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
index e8e541cc..fbd8020d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
@@ -171,9 +171,9 @@ public class CollectionController {
      * @param ids
      * @return
      */
-    @PutMapping("/confirmprice/{ids}")
+    @PostMapping("/confirmprice/{ids}")
     @Transactional
-    public ActionResult confirmPrice(@PathVariable("ids") String ids, @RequestBody @Valid CollectionEntity collectionUpForm)   {
+    public ActionResult confirmPrice(@PathVariable("ids") String ids) {
         String userId=userProvider.get().getUserId();
         String detpartment=null;
         if (!userProvider.get().getIsAdministrator()) {
@@ -248,7 +248,7 @@ public class CollectionController {
 //                    saleordercetEntity.setStatus("3");
                     saleorderitemService.updateById(saleordercetEntity);
                     collectionEntity.setStatus("2");
-                    collectionEntity.setBusinessDate(collectionUpForm.getBusinessDate());
+//                    collectionEntity.setBusinessDate(new Date());
                     collectionEntity.setCollectionUserId(userId);
                     if (StringUtil.isNotNull(detpartment)) {
                         collectionEntity.setCollectionDept(detpartment);
diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue
index d211cd4f..b4a705c7 100644
--- a/SC-web/src/views/scm/basicInformation/collection/index.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/index.vue
@@ -627,38 +627,6 @@ export default {
         });
       }
     },
-    // confirmprice() {
-    //   if (!this.multipleSelection.length) {
-    //     this.$message({
-    //       type: "error",
-    //       message: "请选择一条数据",
-    //       duration: 2500,
-    //     });
-    //     return;
-    //   }
-    //   let ids = this.multipleSelection.join();
-    //   if (this.multipleSelection.length === 1) {
-    //     request({
-    //       url: `/api/collection/Collection/confirmprice/${ids}`,
-    //       method: "POST",
-    //     }).then((res) => {
-    //       this.$message({
-    //         type: "success",
-    //         message: res.msg,
-    //         onClose: () => {
-    //           this.initData();
-    //         },
-    //       });
-    //     });
-    //     if (this.multipleSelection.length > 1) {
-    //       this.$message({
-    //         type: "error",
-    //         message: "请选择单条数据",
-    //         duration: 2500,
-    //       });
-    //     }
-    //   }
-    // },
     confirmprice() {
       if (!this.multipleSelection.length) {
         this.$message({
@@ -668,37 +636,69 @@ export default {
         });
         return;
       }
-
-      this.multipleSelectionItem.forEach((item, index) => {
-        console.log("没有进去")
-      if (item.status == 2) {
-        this.$message({
-          type: "error",
-          message: "单据状态为已认款",
-          duration: 2500,
+      let ids = this.multipleSelection.join();
+      if (this.multipleSelection.length === 1) {
+        request({
+          url: `/api/collection/Collection/confirmprice/${ids}`,
+          method: "POST",
+        }).then((res) => {
+          this.$message({
+            type: "success",
+            message: res.msg,
+            onClose: () => {
+              this.initData();
+            },
+          });
         });
-        console.log("ok")
-        return;
-      } else {
-        if (this.multipleSelection.length === 1) {
-          var id = undefined;
-          id=   this.multipleSelectionItem[0].id
-          this.formVisible3 = true;
-          this.$nextTick(() => {
-            this.$refs.JNPFForm3.init(id);
+        if (this.multipleSelection.length > 1) {
+          this.$message({
+            type: "error",
+            message: "请选择单条数据",
+            duration: 2500,
           });
-
-          if (this.multipleSelection.length > 1) {
-            this.$message({
-              type: "error",
-              message: "请选择单条数据",
-              duration: 2500,
-            });
-          }
         }
       }
-    });
     },
+    // confirmprice() {
+    //   if (!this.multipleSelection.length) {
+    //     this.$message({
+    //       type: "error",
+    //       message: "请选择一条数据",
+    //       duration: 2500,
+    //     });
+    //     return;
+    //   }
+    //
+    //   this.multipleSelectionItem.forEach((item, index) => {
+    //     console.log("没有进去")
+    //   if (item.status == 2) {
+    //     this.$message({
+    //       type: "error",
+    //       message: "单据状态为已认款",
+    //       duration: 2500,
+    //     });
+    //     console.log("ok")
+    //     return;
+    //   } else {
+    //     if (this.multipleSelection.length === 1) {
+    //       var id = undefined;
+    //       id=   this.multipleSelectionItem[0].id
+    //       this.formVisible3 = true;
+    //       this.$nextTick(() => {
+    //         this.$refs.JNPFForm3.init(id);
+    //       });
+    //
+    //       if (this.multipleSelection.length > 1) {
+    //         this.$message({
+    //           type: "error",
+    //           message: "请选择单条数据",
+    //           duration: 2500,
+    //         });
+    //       }
+    //     }
+    //   }
+    // });
+    // },
 
     addOrUpdateHandle(row, isDetail) {
       var id = undefined;