合并

pages/NursingNew/component/pleasetake/component/takehomep.vue

@@ -190,6 +190,7 @@
 				thshow.value = false;
 				errmsg.value = res.message;
 				openerror.value = true;
+				console.log("?????")
 			}
 		})
 	}
@@ -339,7 +340,6 @@
 			elderId: form.elderId
 		}
 		submitQld(obj).then(res => {
-			console.log("入参", obj, "res", res)
 			if (res.success && res.result.status == 'success') {
 				uni.showToast({
 					icon: 'success',
@@ -351,7 +351,8 @@
 					changePage(1)
 				}, 800)
 			} else {
-				errmsg.value = res.result.message;
+				// console.log("!!!!!",res)
+				errmsg.value = res.result.message?res.result.message:res.message
 				openerror.value = true;
 			}
 		})

pages/Warehouse/api/lunpan.js

@@ -13,7 +13,7 @@ export const queryInvoicingList = (params) => {
 // 获取物料分类树（请购列表使用）
 export const getMaterialTreeData = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData?nuId=`+params.nuId,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData?nuId=` + params.nuId,
 		method: 'get',
 		data: params,
 	})
@@ -22,7 +22,8 @@ export const getMaterialTreeData = (params) => {
 // （业务）获取物料分类树（购物车使用）
 export const getGwcMaterialTreeData = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=`+params.nuId,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=` + params
+			.nuId,
 		method: 'get',
 		data: params
 	})
@@ -30,7 +31,8 @@ export const getGwcMaterialTreeData = (params) => {
 // （业务）获取物料分类树（采购单使用）
 export const getCgdMaterialTreeData = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=`+params.nuId,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=` + params
+			.nuId,
 		method: 'get',
 		data: params,
 	})
@@ -107,7 +109,7 @@ export const generatedPurchaseViewOrder = (params) => {
 }
 export const deleteQgInfoById = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/deleteQgInfoById?id=`+params,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/deleteQgInfoById?id=` + params,
 		method: 'DELETE'
 	})
 }
@@ -210,9 +212,9 @@ export const queryPickingRecordList = (params) => {
 	})
 }
 export const editIzNew = (params) => {
- 	return request({
+	return request({
- 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`,
- 		method: 'post',
+		method: 'post',
- 		data: params,
+		data: params,
- 	})
+	})
- }
+}

pages/Warehouse/picking.vue

@@ -1051,7 +1051,7 @@
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import calendar from '@/component/public/calendar.vue'
 	import nomessageimge from '@/pages/procurement/components/nomessage.vue';
-	import tanchuang from '@/pages/procurement/components/tanchuang.vue';
+	
 
 	const open = ref(0);
 	const typechange = ref(0);
@@ -1512,6 +1512,7 @@
 		// if (!plzinfo.cgdParamInfo) return
 		plzinfo.pageNo = 1;
 		plsbuy.value = [];
+		plzinfo.canpull = true
 		queryCgdList(plzinfo).then((res : any) => {
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total

pages/procurement/api/lunpan.js

@@ -364,3 +364,18 @@ export const queryPddList = (params) => {
 		data: params,
 	})
 }
+//获得采购人
+export const queryPddStartByList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/queryPddStartByList`,
+		method: 'get',
+		data: params,
+	})
+} 
+export const addPddMain = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/addPddMain`,
+		method: 'post',
+		data: params,
+	})
+}