Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!168

package.json

@@ -43,7 +43,7 @@
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
-    "core-js": "3.25.3",
+    "core-js": "^3.25.3",
     "echarts": "^5.4.0",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",

src/views/purchase/contract/add/index.vue

@@ -2,11 +2,11 @@
 import Column from "./column";
 import useData from "../hooks/data";
 import useDicts from "../hooks/dicts";
-import useWatch from "../hooks/watch";
+
 import { initParams } from "@/utils/init";
 import { REFER } from "@/components/popover-select/api";
 import { ADD, CODE } from "@/api/business/purchase/contract";
-const { watchContractType } = useWatch();
+
 
 export default {
   name: "AddDrawer",
@@ -20,7 +20,7 @@ export default {
   },
   computed: {},
   watch: {
-    "params.contractType": watchContractType(),
+    
   },
   methods: {
     async fetchCode() {

src/views/purchase/contract/edit/index.vue

@@ -2,11 +2,11 @@
 import Column from "../add/column";
 import useData from "../hooks/data";
 import useDicts from "../hooks/dicts";
-import useWatch from "../hooks/watch";
+
 import { initParams } from "@/utils/init";
 import { REFER } from "@/components/popover-select/api";
 import { EDIT, ITEM, TABLE } from "@/api/business/purchase/contract";
-const { watchContractType } = useWatch();
+
 
 export default {
   name: "EditDrawer",
@@ -26,7 +26,7 @@ export default {
     },
   },
   watch: {
-    "params.contractType": watchContractType(),
+    
   },
   methods: {
     async fetchRefer(prop, type, source) {

src/views/purchase/contract/record/index.vue

@@ -2,11 +2,11 @@
 import Column from "../add/column";
 import useData from "../hooks/data";
 import useDicts from "../hooks/dicts";
-import useWatch from "../hooks/watch";
+
 import { initParams } from "@/utils/init";
 import { REFER } from "@/components/popover-select/api";
 import { ADD, CODE } from "@/api/business/purchase/contract";
-const { watchContractType } = useWatch();
+
 
 export default {
   name: "RecordDrawer",
@@ -20,7 +20,7 @@ export default {
   },
   computed: {},
   watch: {
-    "params.contractType": watchContractType(),
+    
   },
   methods: {
     async fetchCode() {

src/views/purchase/purchase-order/index.vue

@@ -273,6 +273,7 @@ export default {
     },
     // 退回接口
     handleReturn(id,documentIds){
+
       this.$prompt('请输入退回原因', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -281,8 +282,8 @@ export default {
         }).then(async ({ value }) => {
 
           let data = {
-            id,
-            documentIds,
+            id:Number(id),
+            documentIds:documentIds.map(ids =>Number(ids)),
             baskCause: value,
           };
 
@@ -309,7 +310,6 @@ export default {
 
         if (this.checkedList[0].status == 0) {
           // 未审批状态下整单关闭
-
           return false
         }
       }
@@ -321,14 +321,11 @@ export default {
       // 未审批状态下整单关闭
       try {
 
-        this.handleDeleteList(async() =>{
-
-          let puOrderIds = this.checkedList.map(order => {
-
-            return order.id;
+        this.handleConfirmTips(async() =>{
 
-          })
+          let puOrderIds = this.checkedList.map(order => Number(order.id));
 
+          // console.log(puOrderIds,'puOrderIds');
           let { code } = await orderApi.close({ puOrderIds });
 
           if (code === 200) {