|
|
|
@ -235,22 +235,18 @@
|
|
|
|
|
/> |
|
|
|
|
</el-select> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 日期搜索 --> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-if="item.type == 8" |
|
|
|
|
v-model="TcFrom[item.prop]" |
|
|
|
|
type="datetimerange" |
|
|
|
|
format="YYYY-MM-DD HH:mm:ss" |
|
|
|
|
value-format="YYYY-MM-DD HH:mm:ss" |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始时间" |
|
|
|
|
end-placeholder="结束时间" |
|
|
|
|
@change="TcChenge($event, item)" |
|
|
|
|
/> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 日期搜索 --> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-if="item.type == 8" |
|
|
|
|
v-model="TcFrom[item.prop]" |
|
|
|
|
type="datetimerange" |
|
|
|
|
format="YYYY-MM-DD HH:mm:ss" |
|
|
|
|
value-format="YYYY-MM-DD HH:mm:ss" |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始时间" |
|
|
|
|
end-placeholder="结束时间" |
|
|
|
|
@change="TcChenge($event, item)" |
|
|
|
|
/> |
|
|
|
|
</template> |
|
|
|
|
<template #default="props"> |
|
|
|
|
<span v-if="item.type == 1 && item.prop == 'questStatus'"> |
|
|
|
@ -542,7 +538,6 @@
|
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-form-item label="品牌"> |
|
|
|
|
<el-input v-model="formInventory.brandName" disabled placeholder="品牌名称" /> |
|
|
|
|
</el-form-item> |
|
|
|
@ -708,7 +703,7 @@ const Tcrow = ref(); //弹窗当前行
|
|
|
|
|
const WrapBarEditing = ref({}); //弹窗数据编辑 |
|
|
|
|
const PopupEditing = ref(false); //弹窗编辑 |
|
|
|
|
const ElBtnClass = ref(null); |
|
|
|
|
const DiskStatus=ref(true);//已盘、未盘状态 |
|
|
|
|
const DiskStatus = ref(true); //已盘、未盘状态 |
|
|
|
|
const UncountedDetails = ref(); //未盘点明细盘点必须参数 |
|
|
|
|
const contrastData = ref([]); //对比数据表格 |
|
|
|
|
const dialogcontrast = ref(false); //对比数据弹窗 |
|
|
|
@ -1514,9 +1509,9 @@ const InputSo = val => {
|
|
|
|
|
}; |
|
|
|
|
if (DiskStatus.value) { |
|
|
|
|
dataS.questStatus = 1; |
|
|
|
|
}else{ |
|
|
|
|
dataS.questStatus = 0; |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
dataS.questStatus = 0; |
|
|
|
|
} |
|
|
|
|
console.log(dataS, '要提交的数据'); |
|
|
|
|
$_getDetailInfo(dataS).then(res => { |
|
|
|
|
Tctotal.value = res.data.data.total; |
|
|
|
@ -1749,7 +1744,7 @@ const TcViewEvent = (val, Inso) => {
|
|
|
|
|
}; |
|
|
|
|
// 点击详情按钮 |
|
|
|
|
const ViewEvent = val => { |
|
|
|
|
DiskStatus.value=true;//表示当前在已盘点列表 |
|
|
|
|
DiskStatus.value = true; //表示当前在已盘点列表 |
|
|
|
|
InventoryDetails.value.forEach(item => { |
|
|
|
|
item.values = null; |
|
|
|
|
}); |
|
|
|
@ -1794,17 +1789,17 @@ const Discard = val => {
|
|
|
|
|
// 未盘点数据请求 |
|
|
|
|
const NotCountedFn = (row, Inso, type = 0) => { |
|
|
|
|
TcPdloading.value = true; |
|
|
|
|
let dataInfo={ |
|
|
|
|
let dataInfo = { |
|
|
|
|
...Inso, |
|
|
|
|
} |
|
|
|
|
dataInfo.questStatus=type |
|
|
|
|
dataInfo.questNum=row.questNum |
|
|
|
|
dataInfo.questId=row.id |
|
|
|
|
dataInfo.current=TccurrentPage.value //页码 |
|
|
|
|
dataInfo.size=TcpageSize.value//条数 |
|
|
|
|
if(!DiskStatus.value){ |
|
|
|
|
dataInfo.questStatus=0 |
|
|
|
|
}//表示当前在未盘点列表) |
|
|
|
|
}; |
|
|
|
|
dataInfo.questStatus = type; |
|
|
|
|
dataInfo.questNum = row.questNum; |
|
|
|
|
dataInfo.questId = row.id; |
|
|
|
|
dataInfo.current = TccurrentPage.value; //页码 |
|
|
|
|
dataInfo.size = TcpageSize.value; //条数 |
|
|
|
|
if (!DiskStatus.value) { |
|
|
|
|
dataInfo.questStatus = 0; |
|
|
|
|
} //表示当前在未盘点列表) |
|
|
|
|
$_getDetailInfo(dataInfo).then(res => { |
|
|
|
|
TcPdloading.value = false; |
|
|
|
|
console.log(res, '未盘点明细返回值'); |
|
|
|
@ -1820,11 +1815,11 @@ const NotCountedFn = (row, Inso, type = 0) => {
|
|
|
|
|
|
|
|
|
|
// 未盘点明细 |
|
|
|
|
const DetailsNotCounted = row => { |
|
|
|
|
DiskStatus.value=false;//表示当前在未盘点列表 |
|
|
|
|
DiskStatus.value = false; //表示当前在未盘点列表 |
|
|
|
|
InventoryDetails.value.forEach(item => { |
|
|
|
|
item.values = null; |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
UncountedDetails.value = row; |
|
|
|
|
InventoryState.value = true; //修改弹窗标题(未盘点数据), |
|
|
|
|
TcFrom.value = {}; //重置搜索 |
|
|
|
@ -2278,7 +2273,7 @@ const InformationEditing = () => {
|
|
|
|
|
// 弹窗品类搜索 |
|
|
|
|
const TcChenge = (event, val) => { |
|
|
|
|
// 开始时间 startTime |
|
|
|
|
// 结束时间 EndTime |
|
|
|
|
// 结束时间 endTime |
|
|
|
|
console.log(event, val); |
|
|
|
|
TcPdloading.value = true; |
|
|
|
|
console.log(row.value, '必须参数'); |
|
|
|
@ -2292,16 +2287,16 @@ const TcChenge = (event, val) => {
|
|
|
|
|
questNum: quest, |
|
|
|
|
questId: qstId, |
|
|
|
|
}; |
|
|
|
|
data.startTime=event[0] |
|
|
|
|
data.EndTime=event[1] |
|
|
|
|
delete data.inventoryDate |
|
|
|
|
console.log(DiskStatus.value,'DiskStatus.value'); |
|
|
|
|
if (DiskStatus.value) { |
|
|
|
|
data.questStatus = 1; |
|
|
|
|
}else{ |
|
|
|
|
data.questStatus = 0; |
|
|
|
|
} |
|
|
|
|
$_getDetailInfo(data).then(res => { |
|
|
|
|
data.startTime = event[0]; |
|
|
|
|
data.endTime = event[1]; |
|
|
|
|
delete data.inventoryDate; |
|
|
|
|
console.log(DiskStatus.value, 'DiskStatus.value'); |
|
|
|
|
if (DiskStatus.value) { |
|
|
|
|
data.questStatus = 1; |
|
|
|
|
} else { |
|
|
|
|
data.questStatus = 0; |
|
|
|
|
} |
|
|
|
|
$_getDetailInfo(data).then(res => { |
|
|
|
|
Tctotal.value = res.data.data.total; |
|
|
|
|
res.data.data.records.forEach(item => { |
|
|
|
|
item.Checkbox = true; |
|
|
|
|