领料出库

src/pages/picking/outbound/details.vue

@@ -208,6 +208,7 @@ const leaseOutBack = async (item) => {
 		})
 	}else{
 		if(item.manageType==0){//编码
+        console.log('编码xxxxxxxxx', item)
 			const { status,manageType,maTypeName,typeName,storageNum,preNum,alNum,unitName,id,typeId, unitValue} = item
 			leaseApplyInfo.value.maTypeName = maTypeName
 			leaseApplyInfo.value.typeName = typeName
@@ -228,7 +229,8 @@ const leaseOutBack = async (item) => {
 				outNum:item.alNum,
 				taskId:leaseApplyInfo.value.taskId,
 				typeId:item.typeId,
-				parentId:item.parentId
+				parentId:item.parentId,
+                publishTask:leaseApplyInfo.value.publishTask
 			}
 			console.log(param)
 			uni.showModal({
@@ -325,8 +327,6 @@ const onClick = (e, item) => {
     console.log("333333333333333333333333333")
 		if (e.index === 0) {
 			if (item.status == 2) {//已完成
-            console.log("x22222222222222222222",32)
-				console.log(302)//退回
 				leaseOutBack(item)
 			}else{
 				console.log("rrrrrrrrrrrrr",30)

src/pages/picking/outbound/index.vue

@@ -32,7 +32,7 @@
                 </view>
             </uni-col>
             <uni-col :span="6">
-                <view class="search" @click="getTableList()">搜索</view>
+                <view class="search" @click="getTableList(false,true)">搜索</view>
             </uni-col>
         </uni-row>
 
@@ -170,7 +170,12 @@ const onChangeDate = (val) => {
 }
 
 // 获取列表数据
-const getTableList = async (isTap = false) => {
+const getTableList = async (isTap = false,isSearch = false) => {
+    if (isSearch) {
+        // 当进行搜索时，重置页码和列表数据
+        queryParams.value.pageNum = 1;
+        tableList.value = [];
+    }
     console.log('queryParams.value查询参数', queryParams.value)
     const res = await getPickingOutboundListAPI(queryParams.value)
     console.log('res列表数据', res)
@@ -181,8 +186,8 @@ const getTableList = async (isTap = false) => {
         if (res.data.rows.length == 0) {
             tableList.value = []
         } else {
-             tableList.value = res.data.rows
+            //  tableList.value = res.data.rows
-            // tableList.value.push(...res.data.rows)
+            tableList.value = [...tableList.value, ...res.data.rows]
         }
     }
 }
@@ -193,6 +198,7 @@ const getTableList = async (isTap = false) => {
 // })
 
 onShow(() => {
+    queryParams.value.pageNum = 1;
     tableList.value = []
     total.value = 0
     getTableList()

src/pages/picking/outbound/inner-detail.vue

@@ -94,6 +94,7 @@ const queryCodeParams = ref({
     pageSize: 10,
     taskId: '',
     typeId: '', 
+    publishTask: '',
 }) 
 
 // 页面加载完毕
@@ -177,7 +178,7 @@ const onChangeChecked = (item) => {
 const leaseOutBack = async (item) => {
 	
 	// 解构所需要的数据
-	const { typeId, parentId,taskId } = queryParams.value
+	const { typeId, parentId,taskId,publishTask } = queryParams.value
     // const isSelect = codeDeviceList.value.some((e) => e.checked === true) 
     // if (!isSelect) {
     //     uni.showToast({
@@ -206,6 +207,7 @@ const leaseOutBack = async (item) => {
 		taskId,
 		parentId,
 		typeId,
+        publishTask,
 	}
 	console.log(param)
     const res = await leaseOutBackApi(param)