diff --git a/src/api/distribution/createTask.js b/src/api/distribution/createTask.js index d88e35c3..6dec7f65 100644 --- a/src/api/distribution/createTask.js +++ b/src/api/distribution/createTask.js @@ -64,7 +64,7 @@ export const postBatchDelete = params => { // data, // }); // }; - +// 盘点任务包条 export const $_taskQuestSelectStrip = params => { return request({ url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/SelectStrip', @@ -72,3 +72,22 @@ export const $_taskQuestSelectStrip = params => { params, }); }; + +// 盘点任务库存品 +export const $_QuestSelectInventory = params => { + return request({ + url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/SelectInventory', + method: 'get', + params, + }); +}; +// 盘点任务零担 + + +export const $_taskQuestSelectZreo = params => { + return request({ + url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/SelectZreo', + method: 'get', + params, + }); +}; diff --git a/src/views/basic/pda/basicPdaTT.vue b/src/views/basic/pda/basicPda1111.vue similarity index 95% rename from src/views/basic/pda/basicPdaTT.vue rename to src/views/basic/pda/basicPda1111.vue index b7648760..fb154489 100644 --- a/src/views/basic/pda/basicPdaTT.vue +++ b/src/views/basic/pda/basicPda1111.vue @@ -14,8 +14,9 @@ 查看维修记录 - 多选测试 + 多选测试
@@ -36,7 +37,7 @@
- + 查看 - @@ -261,18 +261,17 @@ const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条 const small = ref(false); const background = ref(true); // 是否开启背景颜色 const disabled = ref(false); // 是否禁止使用页码功能 -const data = ref([]); // 表单数据 +const data = ref([]); // 表格数据 const TabHeight = ref(); //动态获取表格高度 const AddLalog = ref(false); //提交弹窗 const img = ref(false); //图片是否上传成功 const ImgText = ref(''); //图片上传成功文件名 -const AddForm = ref({ - //表单信息 -}); +const AddForm = ref({}); //表单所有信息 const value1 = ref(''); //日期 const optionsvalue = ref(''); //下拉框值 const optionsvalue2 = ref(''); //状态值 const uploadRef = ref(); //图片上传 +const tableRef = ref(null); // 用于引用 table 实例 const options = [ //下拉选择框 { @@ -319,6 +318,10 @@ function onLoad() { console.log(res.data.data.records); //表格信息 data.value = res.data.data.records; + const setIn = setTimeout(() => { + toggleSelection(); //表格自动选中函数 + clearTimeout(setIn); //清除定时器 + }, 0); }); } // 动态获取DOM高度给表单防止页面出现滚动条 @@ -328,18 +331,23 @@ onMounted(() => { // 等待DOM高度被复制之后在请求数据，防止被数据撑开高度 onLoad(); }); + // 新增数据功能 const AddInfo = () => { - console.log(111); - AddLalog.value = true; + AddLalog.value = true; //展开表单弹窗 +}; + +// 表格自动选中 +const toggleSelection = () => { + //对表单进行循环把所有表格进行全部选中,或者通过IF对条件满足进行选中 + data.value.forEach((row, i) => { + tableRef.value!.toggleRowSelection(data.value[i], true); + }); }; // 图片上传 const imageUrl = ref(''); // 图片上传成功回调函数 const ImgSuccess: UploadProps['onSuccess'] = (response, uploadFile) => { - console.log(response, uploadFile, '123123123123123122312123'); - console.log(response.data.link); - if (response.success === true) { img.value = true; // 图片放入预览 @@ -347,7 +355,6 @@ const ImgSuccess: UploadProps['onSuccess'] = (response, uploadFile) => { console.log(UrlImg.value); // 图片存入表单准备提交 AddForm.value.photo = response.data.link; - console.log(img.value); // 显示图片名字 ImgText.value = response.data.originalName; } diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue index 45aa0742..ce8f75c7 100644 --- a/src/views/distribution/checkInventoryTask/createTask.vue +++ b/src/views/distribution/checkInventoryTask/createTask.vue @@ -768,7 +768,6 @@ export default { this.form = row; console.log(row,'任务信息'); console.log(this.$router); - // this.$router.push('/distribution/checkInventoryTask/createTaskfrom') this.$router.push({ path: '/distribution/checkInventoryTask/createTaskfrom', query: { diff --git a/src/views/distribution/checkInventoryTask/createTaskfrom.vue b/src/views/distribution/checkInventoryTask/createTaskfrom.vue index cdb5e651..4dd163ab 100644 --- a/src/views/distribution/checkInventoryTask/createTaskfrom.vue +++ b/src/views/distribution/checkInventoryTask/createTaskfrom.vue @@ -1,16 +1,35 @@ @@ -184,7 +423,7 @@ const BTCurrentChange = val => { margin-top: 15px; } :deep(.el-table__row) { - height: 30px; + height: 50px; } :deep(.el-table__cell) { .cell { diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index 0e83c60c..2c27db0e 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -367,7 +367,7 @@ 修改(零担订单) loading + > 提交(零担订单) JSON.stringify(val)) - // 对数组进行去重 - _newSetArr = Array.from(new Set(_arrJAONSTR)) - - // 将数组内对象还原 - this.orderData = _newSetArr.map(val => JSON.parse(val)) - //这里需要对选择的订单进行筛选 - // const info = []; - // this.stockArticleInfo.forEach((item, index) => { - // this.orderList.forEach(order => { - // // const newDate1 = this.orderData.map(item => { // map遍历本地数据 - // // if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据 - // // return item; - // // }); - // // } info.push(order); - // //清理原来订单列表的订单数据 - // info.push(order); - // this.stockArticleInfo.splice(index, 1); - // }); - // }); + const info = []; + this.stockArticleInfo.forEach((item, index) => { + this.orderList.forEach(order => { + // const newDate1 = this.orderData.map(item => { // map遍历本地数据 + // if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据 + // return item; + // }); + // } info.push(order); + //清理原来订单列表的订单数据 + info.push(order); + this.stockArticleInfo.splice(index, 1); + }); + }); - // if (this.orderData.length >= 1) { - // let newDate1 = this.orderData.map(item => { - // // map遍历本地数据 - // if (this.orderList.find(o => o.id !== item.id)) { - // // 如果在接口数据中包含本地数据，则返回这条本地数据 - // return item; - // } - // }); - // console.log('newDate1-------------->', newDate1.length); - // if (newDate1.length >= 1) { - // console.log('newDate1-------------->', newDate1); - // newDate1.forEach(a => { - // this.orderData.push(a); - // }); - // } - // console.log('this.orderData------------->', this.orderData); - // } else { + if (this.orderData.length >= 1) { + let newDate1 = this.orderData.map(item => { + // map遍历本地数据 + if (this.orderList.find(o => o.id !== item.id)) { + // 如果在接口数据中包含本地数据，则返回这条本地数据 + return item; + } + }); + console.log('newDate1-------------->', newDate1.length); + if (newDate1.length >= 1) { + console.log('newDate1-------------->', newDate1); + newDate1.forEach(a => { + this.orderData.push(a); + }); + } + console.log('this.orderData------------->', this.orderData); + } else { - // this.orderData = this.orderList; - // } + this.orderData = this.orderList; + } - // this.orderData.forEach(a => { - // a.reservationNum = a.handQuantity; + this.orderData.forEach(a => { + a.reservationNum = a.handQuantity; - // }); + }); // this.orderData.push(info); diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index f525e67e..d8178910 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -559,13 +559,14 @@ @@ -679,7 +680,6 @@ -