diff --git a/src/api/distribution/createTask.js b/src/api/distribution/createTask.js
index 5b79b70e..7e182398 100644
--- a/src/api/distribution/createTask.js
+++ b/src/api/distribution/createTask.js
@@ -181,8 +181,15 @@ export const $_taskQuestSelectStrip = params => {
params,
});
};
-
-
+// 盘点导出
+export const $_exportGetContrastInfo = params => {
+ return request({
+ url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/export-getContrastInfo',
+ method: 'get',
+ params,
+ responseType: 'blob',
+ });
+};
// 盘点任务库存品
diff --git a/src/router/views/index.js b/src/router/views/index.js
index b0a739f9..d9769ded 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1061,18 +1061,9 @@ export default [
},
],
},
- {
- path: '/aftersales/AbnormalworkOrder',
- component: Layout,
- redirect: '/aftersales/AbnormalworkOrder',
- children: [
- {
- path: '/aftersales/AbnormalworkOrder',
- name: '异常工单',
- component: () => import('@/views/aftersales/abnormalworkOrder.vue'),
- },
- ],
- },
+
+
+
// 下面的代码为 商场客户端的页面
{
@@ -1088,18 +1079,18 @@ export default [
],
},
-// {
-// path: '/distribution/checkInventoryTask/createTaskTemp',
-// component: Layout,
-// redirect: '/distribution/checkInventoryTask/createTaskTemp',
-// children: [
-// {
-// path: '/distribution/checkInventoryTask/createTaskTemp',
-// name: '盘点重构',
-// component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'),
-// },
-// ],
-// },
+{
+ path: '/aftersales/VueTemp',
+ component: Layout,
+ redirect: '/aftersales/VueTemp',
+ children: [
+ {
+ path: '/aftersales/VueTemp',
+ name: '工单',
+ component: () => import('@/views/aftersales/VueTemp.vue'),
+ },
+ ],
+},
// {
// path: '/distribution/turndelivery/devtmp',
diff --git a/src/views/aftersales/VueTemp.vue b/src/views/aftersales/VueTemp.vue
new file mode 100644
index 00000000..7ee43309
--- /dev/null
+++ b/src/views/aftersales/VueTemp.vue
@@ -0,0 +1,249 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ props.row[item.prop] ? props.row[item.prop] : '/' }}
+
+ 明细
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/aftersales/abnormalworkOrder.vue b/src/views/aftersales/abnormalworkOrder.vue
deleted file mode 100644
index 4f3123dd..00000000
--- a/src/views/aftersales/abnormalworkOrder.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Query
-
-
-
-
-
-
-
-
-
diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index 390b0af5..f2625c90 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -128,6 +128,13 @@
>对比数据
+
+ {{
+ props.row[item.prop] ? props.row[item.prop] : '/'
+ }}
+ 导出
+
+
{{
props.row[item.prop] == 1 ? '全部' : props.row[item.prop] == 2 ? '全仓' : '/'
}}
@@ -166,7 +173,7 @@
-
+
@@ -181,6 +188,11 @@
盘点
+
+
+
+
+
@@ -190,7 +202,7 @@
:data="TcPD"
row-key="name"
border
- height="600"
+ height="700"
style="width: 100%"
@select-all="TcselectAll"
@select="TcselectChange"
@@ -250,7 +262,7 @@
-
+
{{
props.row[item.prop] == 0
? '待盘点'
@@ -278,7 +290,6 @@
-
+ 导出
{
}
});
}
-
+// 弹窗全屏
+const BtnfullScreen=()=>{
+ fullScreen.value=!fullScreen.value;
+}
function onLoad() {
getDictionaryBiz('logpm_unit').then(res => {
@@ -1327,6 +1431,7 @@ const InputSo = val => {
});
}
});
+
return;
}
if (val.prop == 'materialCode') {
@@ -1378,14 +1483,29 @@ const InputSo = val => {
const TcAddData = () => {
TcDataaddition.value = true; //新增弹窗显示
};
-// 对比明细导出
-const MXexport = () => {
+// 对比数据导出公共函数
+const DbExTc=(data)=>{
+ $_exportGetContrastInfo({
+ id:data.id,
+ questNum:data.questNum
+ }).then(res=>{
+ console.log(res,'导出');
+ downloadXls(res.data, `${data.questNum}对比明细.xlsx`)
+ })
+}
+// 盘点对比导出
+const ExportDC = (val) => {
+ // 触发下载函数
+console.log(val);
+DbExTc(val)
+};
+// 对比数据导出
+const MXexport=()=>{
// 触发下载函数
- downloadXls(url, '滞留运单.xlsx');
+DbExTc(DbEx.value)
+}
+
- // 释放临时 URL
- // URL.revokeObjectURL(url);
-};
// 新增任务按钮(搜索不到出现此按钮)
const TcDataadditionsubmit = () => {
console.log(Fromnewlyadded.value);
@@ -1523,6 +1643,7 @@ const comparativeData = val => {
dialogcontrast.value = true; //显示对比数据表格
contrastloading.value = true; //开启表格加载
console.log(val, '对比数据当前行');
+ DbEx.value=val;//存储当前行数据用于导出
let data = {};
data.questNum = val.questNum;
data.questId = val.id;
@@ -1537,7 +1658,7 @@ const searchReset = () => {
SoInfoData.value = {};
};
-const TcViewEvent = val => {
+const TcViewEvent = (val,Inso) => {
Statusjudgment.value = false; //关闭新增按钮
TcPdloading.value = true;
console.log(val, '要传递的对象');
@@ -1546,6 +1667,7 @@ const TcViewEvent = val => {
questId: val.id,
current: TccurrentPage.value, //页码
size: TcpageSize.value, //条数
+ ...Inso
};
console.log(data, '要提交的数据');
@@ -1561,6 +1683,11 @@ const TcViewEvent = val => {
};
// 点击详情按钮
const ViewEvent = val => {
+ InventoryDetails.value.forEach(item=>{
+ item.values=null
+ })
+ InventoryState.value=false;//修改标题（盘点数据）
+ TcFrom.value={};//重置表单搜索
TccurrentPage.value = 1; //重置页码
NotCounted.value = false; //关闭未盘点
row.value = val;
@@ -1597,14 +1724,20 @@ const NotCountedFn = row => {
// 未盘点明细
const DetailsNotCounted = row => {
+ InventoryDetails.value.forEach(item=>{
+ item.values=null
+ })
+
+ InventoryState.value=true;//修改弹窗标题（未盘点数据），
+ TcFrom.value={};//重置搜索
TccurrentPage.value = 1; //重置页码
UncheckedRow.value = row; //存储当前点击行的数据
- console.log(row.value, '点击盘点了');
-
+ console.log(row.value,'存储好的数据');
NotCounted.value = true; //展开未盘点
TcPdloading.value = true;
PopupDetails.value = true;
- NotCountedFn(UncheckedRow.value);
+ NotCountedFn(row);
+ row.value = row;
};
// 未盘点转已盘点按钮
const NotInventoried = val => {
@@ -1623,7 +1756,7 @@ const NotInventoried = val => {
id: item.id,
questStatus: (item.questStatus = 1),
questId: item.questId,
- questNum: UncheckedRow.value.questNum,
+ questNum:UncheckedRow.value.questNum,
});
});
console.log(data, '未盘点处理好的值');
@@ -1967,9 +2100,10 @@ const InformationEditing = () => {
const TcChenge = (event, val) => {
console.log(event, val);
TcPdloading.value = true;
+ console.log(row.value,'必须参数');
let data = {
- questNum: row.value.questNum,
- questId: row.value.id,
+ questNum: UncheckedRow.value.questNum,
+ questId: UncheckedRow.value.id,
current: TccurrentPage.value, //页码
size: TcpageSize.value, //条数
...TcFrom.value,
@@ -1995,7 +2129,7 @@ const TcPageSizeChange = val => {
NotCountedFn(UncheckedRow.value);
} else {
console.log(val);
- TcViewEvent(row.value);
+ TcViewEvent(row.value,TcFrom.value);
}
};
@@ -2009,7 +2143,7 @@ const TcSizeChange = val => {
NotCountedFn(UncheckedRow.value);
} else {
console.log(val);
- TcViewEvent(row.value);
+ TcViewEvent(row.value,TcFrom.value);
}
};
// 弹窗翻页
@@ -2116,11 +2250,12 @@ const InventorySubmit = () => {
//
SubData.list = [];
// 结束时间
- SubData.endTime = formInventory.value.time[0];
+ SubData.endTime = formInventory.value.time[1];
// 开始时间
- SubData.startTime = formInventory.value.time[1];
+ SubData.startTime = formInventory.value.time[0];
InventoryPopup.value = false; //关闭创建盘点任务弹窗
loading.value = true; //开启表格加载
+ console.log(SubData,'处理好的数据');
postAddtaskQuest(SubData).then(res => {
onLoad(); //体积之后初始化页面
if ((res.data.code = 200)) {
@@ -2149,15 +2284,15 @@ const InventorySubmit = () => {
}
// 结束时间
- SubData.endTime = formInventory.value.time[0];
+ SubData.endTime = formInventory.value.time[1];
// 开始时间
- SubData.startTime = formInventory.value.time[1];
+ SubData.startTime = formInventory.value.time[0];
console.log(SubData, '处理好要提交的数据');
InventoryPopup.value = false; //关闭创建盘点任务弹窗
- postAddtaskQuest(SubData).then(res => {
- console.log(res, '盘点计划提交成功');
- onLoad(); //体积之后初始化页面
- });
+ // postAddtaskQuest(SubData).then(res => {
+ // console.log(res, '盘点计划提交成功');
+ // onLoad(); //体积之后初始化页面
+ // });
};
@@ -2242,6 +2377,7 @@ const InventorySubmit = () => {
display: flex;
justify-content: flex-end;
margin-top: 80px;
+
}
.Tcstate {
@@ -2286,4 +2422,35 @@ const InventorySubmit = () => {
justify-content: flex-end;
margin-bottom: 10px;
}
+.el-exDc{
+ margin-left: 20px;
+ color: #10d070;
+ cursor: pointer;
+}
+:deep(.el-dialog){
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ .el-dialog__footer{
+ flex: 1;
+ }
+ .dialog-footer{
+ display: flex;
+ align-items: flex-end;
+ }
+}
+.fullScreen{
+ display: flex;
+ margin-left: auto;
+ align-items: center;
+ justify-content: center;
+ i{
+ width: 20px;
+ height: 20px;
+ svg{
+ height: 100%;
+ width: 100%;
+ }
+ }
+}
diff --git a/src/views/distribution/checkInventoryTask/createTaskaaa.vue b/src/views/distribution/checkInventoryTask/createTaska.vue
similarity index 100%
rename from src/views/distribution/checkInventoryTask/createTaskaaa.vue
rename to src/views/distribution/checkInventoryTask/createTaska.vue