From 1772504da433bec2f1695d47e5946c1192e876fb Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 11:53:40 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
index cbbf00e..c7bb98c 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
@@ -14,10 +14,7 @@
ElCol,
} from 'element-plus'
import {
- getPlaceNoForStockList,
- getMaterialModelList,
- instock,
- getPickRet,
+ getPickRet1,
pick
} from '@/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick'
import { Message } from '@element-plus/icons-vue/dist/types'
@@ -61,16 +58,16 @@
// 杩欓噷娣诲姞缁勭洏閫昏緫
}
- // 缁勭洏鍏ュ簱鎿嶄綔
- const handlePalletizeStorage = () => {
- console.log('缁勭洏鍏ュ簱鎿嶄綔', queryForm.value)
- instock(queryForm.value), resetQueryForm()
- ElMessage.success({
- message: '缁勭洏鍏ュ簱鎴愬姛',
- type: 'success',
- })
- // 杩欓噷娣诲姞缁勭洏鍏ュ簱閫昏緫
- }
+ // // 缁勭洏鍏ュ簱鎿嶄綔
+ // const handlePalletizeStorage = () => {
+ // console.log('缁勭洏鍏ュ簱鎿嶄綔', queryForm.value)
+ // instock(queryForm.value), resetQueryForm()
+ // ElMessage.success({
+ // message: '缁勭洏鍏ュ簱鎴愬姛',
+ // type: 'success',
+ // })
+ // // 杩欓噷娣诲姞缁勭洏鍏ュ簱閫昏緫
+ // }
const resetQueryForm = () => {
queryForm.value.materialModel = ''
@@ -79,22 +76,22 @@
queryForm.value.stockNumber = ''
}
- const getModelList = async () => {
- const models = await getMaterialModelList()
- modelOptions.value = models.map((item: string) => ({
- value: item.materialModel,
- label: item.materialModelDesc,
- }))
- }
+ // const getModelList = async () => {
+ // const models = await getMaterialModelList()
+ // modelOptions.value = models.map((item: string) => ({
+ // value: item.materialModel,
+ // label: item.materialModelDesc,
+ // }))
+ // }
- const getPlaceNoList = async () => {
- const placeNos = await getPlaceNoForStockList(2)
- console.log('搴撲綅鍙峰垪琛�:', placeNos)
- placeNoOptions.value = placeNos.map((item: string) => ({
- value: item.placeNo,
- label: item.placeNoDesc,
- }))
- }
+ // const getPlaceNoList = async () => {
+ // const placeNos = await getPlaceNoForStockList(2)
+ // console.log('搴撲綅鍙峰垪琛�:', placeNos)
+ // placeNoOptions.value = placeNos.map((item: string) => ({
+ // value: item.placeNo,
+ // label: item.placeNoDesc,
+ // }))
+ // }
const handleChange =async (value) => {
console.log('杈撳叆鍐呭纭:', value); // 澶卞幓鐒︾偣鎴栧洖杞︽椂瑙﹀彂
if(value==''){
@@ -108,7 +105,7 @@
processName:'鍒囧壊宸ュ簭',
processName_FilterMode:2,//绮惧噯鏌ヨ
}
- const workPlan = await getPickRet(param);
+ const workPlan = await getPickRet1(param);
console.log('杩斿洖:'+workPlan);
if(workPlan.code!="200"){
ElMessage.error('娌℃湁鎵惧埌鏁版嵁');
@@ -156,6 +153,7 @@
).then(async () => {
//鎮ㄧ殑涓氬姟閫昏緫
const param={
+ taskCode:queryForm.value.taskCode,
pipeSpecCode:queryForm.value.pipeSpecCode,
continerNo:queryForm.value.continerNo,
placeNo:queryForm.value.placeNo
--
Gitblit v1.9.3