From 8c35d8642cefbd878627305aeffa8968cec1d191 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 30 Nov 2023 11:35:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/VueTemp.vue | 154 +++-- .../checkInventoryTask/createTask.vue | 616 +++++++++--------- 2 files changed, 430 insertions(+), 340 deletions(-) diff --git a/src/views/aftersales/VueTemp.vue b/src/views/aftersales/VueTemp.vue index 782e94aa..ac9c35b4 100644 --- a/src/views/aftersales/VueTemp.vue +++ b/src/views/aftersales/VueTemp.vue @@ -100,38 +100,54 @@
- + - - +
+ - - + + + + + + + +
- 搜 索 + 搜 索 清 空
@@ -398,12 +414,21 @@ label="配送司机" v-if="groundlineSet || groundlineType == 3 || groundlineType == 4" > - + > + + @@ -530,7 +555,7 @@ - + { let data = { ...val, }; - columnList[2].checkarr = [];//重置下拉搜索框 + columnList[2].checkarr = []; //重置下拉搜索框 columnList[3].checkarr = []; data.current = page.value.currentPage; //页码 data.size = page.value.pageSize; //条数 @@ -1303,7 +1342,7 @@ const IndexTable = val => { } else if (item.workOrderType == 5) { item.workOrderTypeName = columnList[2].checkarr[4].label; //其他 } - + // 提货环节下拉赋值 if (item.discoveryNode == 1) { item.discoveryNodeName = columnList[3].checkarr[0].label; //提货环节 } else if (item.discoveryNode == 2) { @@ -1385,7 +1424,13 @@ const AddInfo = () => { // 首页新增表单确定 const ConfirmForm = () => { + console.log(Indexform.value.deliveryDriver, 'Indexform.value.deliveryDriver'); console.log(Indexform.value.processor, 'Indexform.value.processor'); + // 匹配司机名字 + Indexform.value.deliveryDriver = DeliveryDriver.value.find( + item => item.value == Indexform.value.deliveryDriver + ).label; + console.log(Indexform.value.deliveryDriver); // 输出李华 FromDisabled.value = false; //启用输入框 let processorEntityList = []; let ProcessingParty = { @@ -1410,17 +1455,22 @@ const ConfirmForm = () => { delete DataSubmit.processor; //移除多余字段 console.log(DataSubmit, '处理好的表单信息'); Indexdialog.value = false; //关闭表单弹窗 - $_submit(DataSubmit).then(res => { - if (res.data.code == 200) { - ElMessage({ - message: res.data.msg, - type: 'success', - }); - IndexTable(); - } - }); + // $_submit(DataSubmit).then(res => { + // if (res.data.code == 200) { + // ElMessage({ + // message: res.data.msg, + // type: 'success', + // }); + Indexform.value = {}; //重置表单 + // IndexTable(); + // } + // }); +}; +// 顶部搜索 +const searchHide = () => { + console.log(details); + details.search = !details.search; }; - // 首页查看详情按钮 const view = val => { console.log(val, '当前行数据'); @@ -1564,8 +1614,6 @@ const btnsc = val => { console.log(val); }; - - // // 下拉框搜索公共函数 // const updateDetailQuery = (index, propName, obj) => { // // 更新或删除查询参数 @@ -1578,7 +1626,7 @@ const btnsc = val => { // const processRowProperty = (index, row, details) => { // const nameRegex = /(\w+)Name$/; // 捕获以'Name'结尾的属性名 // const match = row.prop.match(nameRegex); - + // // 如果属性以'Name'结尾,则更新相应的查询参数 // if (match) { // const basePropName = match[1]; // 获取不包含'Name'的属性名 @@ -1592,12 +1640,11 @@ const btnsc = val => { // } // }; - /** 表格表头下拉框选择 */ const selectsc = (index, row) => { console.log('index :>> ', index); console.log('row :>> ', row); - + processRowProperty(index, row, details); console.log(details.query, details.query); IndexTable(details.query); @@ -1837,7 +1884,7 @@ const changeProcessingResults = val => { } .lptime { margin-top: 30px; - padding-left: 50px; + padding-left: 60px; display: flex; flex-direction: column; font-size: 14px; @@ -1893,10 +1940,23 @@ const changeProcessingResults = val => { height: 38px; } } -.el-fy{ +.el-fy { flex: 1; - display: flex; - align-items: flex-end; - margin-bottom: 10px; + display: flex; + align-items: flex-end; + margin-bottom: 10px; +} +.el-times{ + :deep(.el-input__wrapper){ + height: 30px !important; + } + +} +.el_tims_box{ + display: flex; +} +.el-btn{ + width: 100%; + } diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue index 03667a4a..2e374d26 100644 --- a/src/views/distribution/checkInventoryTask/createTask.vue +++ b/src/views/distribution/checkInventoryTask/createTask.vue @@ -31,6 +31,8 @@ 创建盘点任务 + 废弃 + 延期
@@ -79,7 +81,7 @@ >