|
|
|
@ -239,7 +239,7 @@
|
|
|
|
|
<el-input |
|
|
|
|
@change="InputSo(item)" |
|
|
|
|
clearable |
|
|
|
|
v-if="item.type == 5 || item.prop == 'categoryName'" |
|
|
|
|
v-if="item.type == 5 || item.prop == 'categoryName' || item.prop == 'materialCode'" |
|
|
|
|
v-model="item.values" |
|
|
|
|
:placeholder="`请输入${item.label}`" |
|
|
|
|
/> |
|
|
|
@ -288,7 +288,7 @@
|
|
|
|
|
}}</span |
|
|
|
|
> |
|
|
|
|
|
|
|
|
|
<span v-if="item.type == 10"> |
|
|
|
|
<span v-if="item.type == 10 && item.prop !='materialCode'"> |
|
|
|
|
<el-input |
|
|
|
|
clearable |
|
|
|
|
:disabled="props.row.Checkbox" |
|
|
|
@ -297,6 +297,25 @@
|
|
|
|
|
/> |
|
|
|
|
</span> |
|
|
|
|
|
|
|
|
|
<span v-if="item.type==10 && item.prop == 'materialCode'"> |
|
|
|
|
<!-- 下拉搜索 --> |
|
|
|
|
<el-select v-if="props.row.wLinputState" v-model="props.row.Input" filterable placeholder="请输入物料编码" > |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in Wloptions" |
|
|
|
|
:key="item.value" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.value" |
|
|
|
|
/> |
|
|
|
|
</el-select> |
|
|
|
|
<el-input v-else |
|
|
|
|
@change='wLcheng(props.row,props.row)' |
|
|
|
|
clearable |
|
|
|
|
:disabled="props.row.Checkbox" |
|
|
|
|
v-model="props.row.Input" |
|
|
|
|
:placeholder="`请输入${item.label}`" |
|
|
|
|
/> |
|
|
|
|
|
|
|
|
|
</span> |
|
|
|
|
<div :class="ElBtnClass" v-if="item.type == 3 && !NotCounted"> |
|
|
|
|
<el-button |
|
|
|
|
:link="ElButtonS[2].link" |
|
|
|
@ -588,7 +607,7 @@
|
|
|
|
|
row-key="name" |
|
|
|
|
border |
|
|
|
|
height="600" |
|
|
|
|
style="width: 100%" |
|
|
|
|
style="width:100%" |
|
|
|
|
@select-all="contrastselectAll" |
|
|
|
|
@select="contrastselectChange" |
|
|
|
|
> |
|
|
|
@ -602,7 +621,6 @@
|
|
|
|
|
width: 宽度 |
|
|
|
|
prop: 数据字段 |
|
|
|
|
--> |
|
|
|
|
|
|
|
|
|
<el-table-column |
|
|
|
|
:prop="item.prop" |
|
|
|
|
:label="item.label" |
|
|
|
@ -665,11 +683,13 @@ import {
|
|
|
|
|
$_exportGetContrastInfo, |
|
|
|
|
$_getList, |
|
|
|
|
} from '@/api/distribution/createTask'; |
|
|
|
|
import { ElMessageBox } from 'element-plus' |
|
|
|
|
import { ElMessage } from 'element-plus'; |
|
|
|
|
import { downloadXls } from '@/utils/util'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import { ref } from 'vue'; |
|
|
|
|
|
|
|
|
|
const wLinput=ref(null);//物料编码搜索框 |
|
|
|
|
const wLinputState=ref(false);//标记是否显示下拉框 |
|
|
|
|
const SoInfoData = ref({}); //搜索框参数 |
|
|
|
|
const searchSo = ref(false); //搜索框 |
|
|
|
|
const ElData = ref([]); //表格的值 |
|
|
|
@ -978,7 +998,7 @@ const InventoryDetails = ref([
|
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'updateUser', |
|
|
|
|
prop: 'inventoryPerson', |
|
|
|
|
label: '盘点人', |
|
|
|
|
type: 4, |
|
|
|
|
values: '', |
|
|
|
@ -989,7 +1009,7 @@ const InventoryDetails = ref([
|
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'updateTime', |
|
|
|
|
prop: 'inventoryDate', |
|
|
|
|
label: '盘点时间', |
|
|
|
|
type: 4, |
|
|
|
|
values: '', |
|
|
|
@ -1032,20 +1052,21 @@ const InventoryDetails = ref([
|
|
|
|
|
search: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
prop: 'brandName', |
|
|
|
|
label: '品牌', |
|
|
|
|
type: 4, |
|
|
|
|
prop: 'categoryName', |
|
|
|
|
label: '产品名称', |
|
|
|
|
type: 10, |
|
|
|
|
values: '', |
|
|
|
|
width: '250', |
|
|
|
|
width: '260', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
search: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'categoryName', |
|
|
|
|
label: '产品名称', |
|
|
|
|
prop: 'materialCode', |
|
|
|
|
label: '物料编码', |
|
|
|
|
type: 10, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
@ -1055,11 +1076,11 @@ const InventoryDetails = ref([
|
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'materialCode', |
|
|
|
|
label: '物料编码', |
|
|
|
|
type: 5, |
|
|
|
|
prop: 'brandName', |
|
|
|
|
label: '品牌', |
|
|
|
|
type: 4, |
|
|
|
|
values: '', |
|
|
|
|
width: '260', |
|
|
|
|
width: '250', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
search: true, |
|
|
|
@ -1101,6 +1122,28 @@ const contrast = ref([
|
|
|
|
|
search: true, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'trayCode', |
|
|
|
|
label: '托盘码', |
|
|
|
|
type: 4, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
search: false, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'trayName', |
|
|
|
|
label: '托盘名称', |
|
|
|
|
type: 4, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
search: false, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'brandName', |
|
|
|
|
label: '品牌', |
|
|
|
@ -1178,17 +1221,6 @@ const contrast = ref([
|
|
|
|
|
search: false, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'pallet', |
|
|
|
|
label: '所在托盘号', |
|
|
|
|
type: 4, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
search: false, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'positionCode', |
|
|
|
|
label: '货区-货架-货位', |
|
|
|
@ -1201,7 +1233,7 @@ const contrast = ref([
|
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'updateUser', |
|
|
|
|
prop: 'inventoryPerson', |
|
|
|
|
label: '盘点人', |
|
|
|
|
type: 4, |
|
|
|
|
values: '', |
|
|
|
@ -1212,7 +1244,7 @@ const contrast = ref([
|
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'updateTime', |
|
|
|
|
prop: 'inventoryDate', |
|
|
|
|
label: '盘点时间', |
|
|
|
|
type: 4, |
|
|
|
|
values: '', |
|
|
|
@ -1244,28 +1276,7 @@ const contrast = ref([
|
|
|
|
|
search: false, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'trayCode', |
|
|
|
|
label: '托盘码', |
|
|
|
|
type: 4, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
search: false, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'trayName', |
|
|
|
|
label: '托盘名称', |
|
|
|
|
type: 4, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
search: false, |
|
|
|
|
head: true, |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
prop: 'groundingPositionCode', |
|
|
|
|
label: '新货位', |
|
|
|
@ -1420,57 +1431,57 @@ const InputSo = val => {
|
|
|
|
|
let data = {}; |
|
|
|
|
data.current = TccurrentPage.value; |
|
|
|
|
data.size = TcpageSize.value; |
|
|
|
|
if (val.prop == 'categoryName') { |
|
|
|
|
//查询产品名称 |
|
|
|
|
data.name = val.values; |
|
|
|
|
$_materialList(data).then(res => { |
|
|
|
|
console.log(res, '查询的返回值'); |
|
|
|
|
if (res.data.data.records.length) { |
|
|
|
|
Tctotal.value = res.data.data.total; |
|
|
|
|
res.data.data.records.forEach(item => { |
|
|
|
|
item.Checkbox = true; |
|
|
|
|
}); |
|
|
|
|
TcPdloading.value = false; |
|
|
|
|
console.log(res, '明细返回值'); |
|
|
|
|
TcPD.value = res.data.data.records; |
|
|
|
|
} else { |
|
|
|
|
Statusjudgment.value = true; //显示新增按钮 |
|
|
|
|
TcPD.value = res.data.data.records; |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '暂未查询到内容', |
|
|
|
|
type: 'warning', |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
// if (val.prop == 'categoryName') { |
|
|
|
|
// //查询产品名称 |
|
|
|
|
// data.name = val.values; |
|
|
|
|
// $_materialList(data).then(res => { |
|
|
|
|
// console.log(res, '查询的返回值'); |
|
|
|
|
// if (res.data.data.records.length) { |
|
|
|
|
// Tctotal.value = res.data.data.total; |
|
|
|
|
// res.data.data.records.forEach(item => { |
|
|
|
|
// item.Checkbox = true; |
|
|
|
|
// }); |
|
|
|
|
// TcPdloading.value = false; |
|
|
|
|
// console.log(res, '明细返回值'); |
|
|
|
|
// TcPD.value = res.data.data.records; |
|
|
|
|
// } else { |
|
|
|
|
// Statusjudgment.value = true; //显示新增按钮 |
|
|
|
|
// TcPD.value = res.data.data.records; |
|
|
|
|
// ElMessage({ |
|
|
|
|
// message: '暂未查询到内容', |
|
|
|
|
// type: 'warning', |
|
|
|
|
// }); |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if (val.prop == 'materialCode') { |
|
|
|
|
//查询物料编码 |
|
|
|
|
data.sku = val.values; |
|
|
|
|
$_materialList(data).then(res => { |
|
|
|
|
console.log(res, '查询的返回值'); |
|
|
|
|
if (res.data.data.records.length) { |
|
|
|
|
Tctotal.value = res.data.data.total; |
|
|
|
|
res.data.data.records.forEach(item => { |
|
|
|
|
item.Checkbox = true; |
|
|
|
|
}); |
|
|
|
|
TcPdloading.value = false; |
|
|
|
|
console.log(res, '明细返回值'); |
|
|
|
|
TcPD.value = res.data.data.records; |
|
|
|
|
} else { |
|
|
|
|
Statusjudgment.value = true; //显示新增按钮 |
|
|
|
|
TcPD.value = res.data.data.records; |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '暂未查询到内容', |
|
|
|
|
type: 'warning', |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
// return; |
|
|
|
|
// } |
|
|
|
|
// if (val.prop == 'materialCode') { |
|
|
|
|
// //查询物料编码 |
|
|
|
|
// data.sku = val.values; |
|
|
|
|
// $_materialList(data).then(res => { |
|
|
|
|
// console.log(res, '查询的返回值'); |
|
|
|
|
// if (res.data.data.records.length) { |
|
|
|
|
// Tctotal.value = res.data.data.total; |
|
|
|
|
// res.data.data.records.forEach(item => { |
|
|
|
|
// item.Checkbox = true; |
|
|
|
|
// }); |
|
|
|
|
// TcPdloading.value = false; |
|
|
|
|
// console.log(res, '明细返回值'); |
|
|
|
|
// TcPD.value = res.data.data.records; |
|
|
|
|
// } else { |
|
|
|
|
// Statusjudgment.value = true; //显示新增按钮 |
|
|
|
|
// TcPD.value = res.data.data.records; |
|
|
|
|
// ElMessage({ |
|
|
|
|
// message: '暂未查询到内容', |
|
|
|
|
// type: 'warning', |
|
|
|
|
// }); |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
// return; |
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
if (val.prop != 'categoryName' || val.prop != 'materialCode') { |
|
|
|
|
// if (val.prop != 'categoryName' || val.prop != 'materialCode') { |
|
|
|
|
let dataS = { |
|
|
|
|
questNum: row.value.questNum, |
|
|
|
|
questId: row.value.id, |
|
|
|
@ -1483,12 +1494,13 @@ const InputSo = val => {
|
|
|
|
|
Tctotal.value = res.data.data.total; |
|
|
|
|
res.data.data.records.forEach(item => { |
|
|
|
|
item.Checkbox = true; |
|
|
|
|
item.wLinputState=false; |
|
|
|
|
}); |
|
|
|
|
TcPdloading.value = false; |
|
|
|
|
console.log(res, '明细返回值222'); |
|
|
|
|
TcPD.value = res.data.data.records; |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
// } |
|
|
|
|
}; |
|
|
|
|
// 点击新增按钮 |
|
|
|
|
const TcAddData = () => { |
|
|
|
@ -1594,6 +1606,7 @@ const extension = val => {
|
|
|
|
|
// 批量删除盘点任务 |
|
|
|
|
const BatchDelete = () => {}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 延期提交 |
|
|
|
|
const InventoryDate = () => { |
|
|
|
|
console.log(TcData.value, '延期'); |
|
|
|
@ -1617,6 +1630,7 @@ const InventoryDate = () => {
|
|
|
|
|
|
|
|
|
|
// 提交修改 |
|
|
|
|
const InventoryModification = () => { |
|
|
|
|
console.log(Tcrow.value,'Tcrow.value'); |
|
|
|
|
if (!Tcrow.value) { |
|
|
|
|
ElMessage({ |
|
|
|
|
showClose: true, |
|
|
|
@ -1637,17 +1651,18 @@ const InventoryModification = () => {
|
|
|
|
|
questNum: row.value.questNum, |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
$_updateDetailInfo(data).then(res => { |
|
|
|
|
TcViewEvent(row.value); //修改之后刷新页面 |
|
|
|
|
console.log(res, '修改成功之后的返回值'); |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
ElMessage({ |
|
|
|
|
showClose: true, |
|
|
|
|
message: res.data.msg, |
|
|
|
|
type: 'success', |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
console.log(data, '要提交的数据'); |
|
|
|
|
// $_updateDetailInfo(data).then(res => { |
|
|
|
|
// TcViewEvent(row.value); //修改之后刷新页面 |
|
|
|
|
// console.log(res, '修改成功之后的返回值'); |
|
|
|
|
// if (res.data.code == 200) { |
|
|
|
|
// ElMessage({ |
|
|
|
|
// showClose: true, |
|
|
|
|
// message: res.data.msg, |
|
|
|
|
// type: 'success', |
|
|
|
|
// }); |
|
|
|
|
// } |
|
|
|
|
// }); |
|
|
|
|
}; |
|
|
|
|
// 对比数据按钮 |
|
|
|
|
const comparativeData = val => { |
|
|
|
@ -1686,6 +1701,7 @@ const TcViewEvent = (val,Inso) => {
|
|
|
|
|
Tctotal.value = res.data.data.total; |
|
|
|
|
res.data.data.records.forEach(item => { |
|
|
|
|
item.Checkbox = true; |
|
|
|
|
item.wLinputState=false; |
|
|
|
|
}); |
|
|
|
|
TcPdloading.value = false; |
|
|
|
|
console.log(res, '明细返回值'); |
|
|
|
@ -1727,6 +1743,7 @@ const NotCountedFn = (row,Inso) => {
|
|
|
|
|
console.log(res, '未盘点明细返回值'); |
|
|
|
|
res.data.data.records.forEach(item => { |
|
|
|
|
item.Checkbox = true; |
|
|
|
|
item.wLinputState=false; |
|
|
|
|
}); |
|
|
|
|
TcPD.value = res.data.data.records; |
|
|
|
|
Tctotal.value = res.data.data.total; //总页码 |
|
|
|
@ -1994,7 +2011,6 @@ const StatusDetermination = () => {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const optionss = ref([]) |
|
|
|
|
const loadings = ref(false) |
|
|
|
|
const list = ref([]) |
|
|
|
|
const remoteMethod = (query) => { |
|
|
|
|
if (query !== '') { |
|
|
|
@ -2020,6 +2036,55 @@ const Tclist = val => {
|
|
|
|
|
} |
|
|
|
|
console.log(TcReaJoin.value, '处理好的数据'); |
|
|
|
|
}; |
|
|
|
|
// 物料编码 |
|
|
|
|
|
|
|
|
|
const Wllist = ref([]) |
|
|
|
|
const WLCode = (query) => { |
|
|
|
|
if (query !== '') { |
|
|
|
|
optionss.value = Wllist.value.filter((item) => { |
|
|
|
|
return item.label.toLowerCase().includes(query.toLowerCase()) |
|
|
|
|
}) |
|
|
|
|
} else { |
|
|
|
|
optionss.value = [] |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// 物料列表 |
|
|
|
|
const Wloptions = ref([]) |
|
|
|
|
// 物料信息搜索 |
|
|
|
|
const wLcheng=(val,info)=>{ |
|
|
|
|
console.log(val.undefined); |
|
|
|
|
console.log(info,'信息'); |
|
|
|
|
$_materialList({ |
|
|
|
|
name:val.undefined |
|
|
|
|
}).then(res=>{ |
|
|
|
|
console.log(res,'物料查询'); |
|
|
|
|
if(!res.data.data.records.length){ |
|
|
|
|
ElMessageBox.confirm('暂无数据是否新增?') |
|
|
|
|
.then(() => { |
|
|
|
|
TcDataaddition.value=true |
|
|
|
|
}) |
|
|
|
|
.catch(() => { |
|
|
|
|
// catch error |
|
|
|
|
}) |
|
|
|
|
}else{ |
|
|
|
|
// productCode |
|
|
|
|
// wLinputState.value=true;//开启下拉选择 |
|
|
|
|
|
|
|
|
|
info.wLinputState=true; |
|
|
|
|
// Wloptions.value 下拉选择变量 |
|
|
|
|
res.data.data.records.forEach(item=>{ |
|
|
|
|
Wloptions.value.push( |
|
|
|
|
{ |
|
|
|
|
label:item.name, |
|
|
|
|
value:item.id |
|
|
|
|
} |
|
|
|
|
) |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 盘点详情编辑 |
|
|
|
|
const InventoryEditing = val => { |
|
|
|
|
$_getList({ |
|
|
|
@ -2165,6 +2230,7 @@ const TcChenge = (event, val) => {
|
|
|
|
|
Tctotal.value = res.data.data.total; |
|
|
|
|
res.data.data.records.forEach(item => { |
|
|
|
|
item.Checkbox = true; |
|
|
|
|
item.wLinputState=false; |
|
|
|
|
}); |
|
|
|
|
TcPdloading.value = false; |
|
|
|
|
console.log(res, '明细返回值'); |
|
|
|
|