|
|
|
@ -35,7 +35,7 @@ |
|
|
|
@click="handleCreateBills()" |
|
|
|
>生成出库单(支持批量)</el-button |
|
|
|
> |
|
|
|
<el-button |
|
|
|
<el-button |
|
|
|
class="filter-item" |
|
|
|
type="success" |
|
|
|
icon="el-icon-check" |
|
|
|
@ -401,18 +401,21 @@ |
|
|
|
</el-col> |
|
|
|
<el-col :md="20" :xs="24" style="margin-left: -80px"> |
|
|
|
<el-form-item prop="materialGroupValue"> |
|
|
|
<el-select |
|
|
|
<el-select |
|
|
|
v-model="formCount.materialGroupValue" |
|
|
|
style="width: 350px;margin-right: 15px" |
|
|
|
size="medium" |
|
|
|
multiple |
|
|
|
filterable |
|
|
|
clearable |
|
|
|
style="width: 380px; margin-right: 15px" |
|
|
|
@change="valueChange" |
|
|
|
placeholder="请选择" |
|
|
|
> |
|
|
|
<el-option |
|
|
|
v-for="item in materialGroupList" |
|
|
|
:key="item.label" |
|
|
|
:key="item.value" |
|
|
|
:label="item.value" |
|
|
|
:value="item.label" |
|
|
|
:value="item.value" |
|
|
|
> |
|
|
|
<span style="float: left">{{ item.label }}</span> |
|
|
|
<span style="float: right; color: #8492a6; font-size: 13px">{{ |
|
|
|
@ -428,17 +431,30 @@ |
|
|
|
<el-col :md="4" :xs="24"> |
|
|
|
<el-form-item label="CP5时间：" /> |
|
|
|
</el-col> |
|
|
|
<el-col :md="20" :xs="24" style="margin-left: -80px"> |
|
|
|
<el-col :md="10" :xs="24" style="margin-left: -80px"> |
|
|
|
<el-form-item> |
|
|
|
<el-date-picker |
|
|
|
v-model="datetime5" |
|
|
|
type="datetimerange" |
|
|
|
:picker-options="pickerOptionsCp5" |
|
|
|
range-separator="至" |
|
|
|
start-placeholder="开始日期" |
|
|
|
end-placeholder="结束日期" |
|
|
|
v-model="cp5startTime" |
|
|
|
:picker-options="pickerOptions2" |
|
|
|
type="datetime" |
|
|
|
size="small" |
|
|
|
@change="getdateValueCp5" |
|
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
:default-time="['00:00:00', '23:59:59']" |
|
|
|
default-time="00:00:00" |
|
|
|
> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :md="10" :xs="24" style="margin-left: -40px"> |
|
|
|
<el-form-item> |
|
|
|
<el-date-picker |
|
|
|
v-model="cp5endTime" |
|
|
|
:picker-options="pickerOptions3" |
|
|
|
type="datetime" |
|
|
|
size="small" |
|
|
|
@change="getdateValCp5" |
|
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
default-time="23:59:59" |
|
|
|
> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
@ -483,37 +499,60 @@ |
|
|
|
<el-form-item label="KEEN号" /> |
|
|
|
</el-col> |
|
|
|
<el-col :md="10" :xs="24" style="margin-left: -80px"> |
|
|
|
<el-form-item> |
|
|
|
<el-input v-model="formCount.kennCode" /> |
|
|
|
<el-form-item prop="kennCode"> |
|
|
|
<el-input |
|
|
|
type="textarea" |
|
|
|
v-model="formCount.kennCode" |
|
|
|
style="width: 170px" |
|
|
|
:rows="4" |
|
|
|
placeholder="多个KENN号，请以回车换行形式添加！" |
|
|
|
/> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :md="4" :xs="24"> |
|
|
|
<el-form-item label="底盘号" /> |
|
|
|
</el-col> |
|
|
|
<el-col :md="10" :xs="24" style="margin-left: -95px"> |
|
|
|
<el-form-item> |
|
|
|
<el-input v-model="formCount.chassisNumber" /> |
|
|
|
<el-form-item prop="chassisNumber"> |
|
|
|
<el-input |
|
|
|
v-model="formCount.chassisNumber" |
|
|
|
style="width: 170px" |
|
|
|
type="textarea" |
|
|
|
:rows="4" |
|
|
|
placeholder="多个底盘号，请以回车换行形式添加！" |
|
|
|
/> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
|
|
|
|
<el-row> |
|
|
|
<el-col :md="4" :xs="24"> |
|
|
|
<el-form-item label="客户零件号" /> |
|
|
|
</el-col> |
|
|
|
<el-col :md="10" :xs="24" style="margin-left: -80px"> |
|
|
|
<el-form-item> |
|
|
|
<el-input v-model="formCount.materialCode" /> |
|
|
|
<el-form-item prop="materialCode"> |
|
|
|
<el-input |
|
|
|
v-model="formCount.materialCode" |
|
|
|
style="width: 170px" |
|
|
|
type="textarea" |
|
|
|
:rows="4" |
|
|
|
placeholder="多个客户零件号，请以回车换行形式添加！" |
|
|
|
/> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<!-- <el-col :md="4" :xs="24"> |
|
|
|
<el-form-item label="客户零件号" /> |
|
|
|
<el-col :md="4" :xs="24"> |
|
|
|
<el-form-item label="厂内零件号" /> |
|
|
|
</el-col> |
|
|
|
<el-col :md="10" :xs="24" style="margin-left: -95px"> |
|
|
|
<el-form-item> |
|
|
|
<el-input v-model="formCount.sapMaterialCode" /> |
|
|
|
<el-form-item prop="sapCode"> |
|
|
|
<el-input |
|
|
|
v-model="formCount.sapCode" |
|
|
|
style="width: 170px" |
|
|
|
type="textarea" |
|
|
|
:rows="4" |
|
|
|
placeholder="多个厂内零件号，请以回车换行形式添加！" |
|
|
|
/> |
|
|
|
</el-form-item> |
|
|
|
</el-col> --> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
@ -577,6 +616,25 @@ export default { |
|
|
|
return time.getTime() <= new Date(this.startTime).getTime(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
pickerOptions1: { |
|
|
|
disabledDate: (time) => { |
|
|
|
//return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now(); |
|
|
|
return time.getTime() <= new Date(this.startTime).getTime(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
pickerOptions2: { |
|
|
|
disabledDate: (time) => { |
|
|
|
//if (this.endTime != "") { |
|
|
|
return time.getTime() > new Date(this.cp5endTime).getTime(); |
|
|
|
//} |
|
|
|
}, |
|
|
|
}, |
|
|
|
pickerOptions3: { |
|
|
|
disabledDate: (time) => { |
|
|
|
return time.getTime() <= new Date(this.cp5startTime).getTime(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
startTime: "", |
|
|
|
endTime: "", |
|
|
|
pickerOptionsCp7: { |
|
|
|
@ -601,6 +659,7 @@ export default { |
|
|
|
radio: "0", //结算状态：0未结 1部分结算 |
|
|
|
versionList: [], |
|
|
|
materialGroupList: [], |
|
|
|
getmaterialGroupValue: "", |
|
|
|
// 是否显示详细弹出层 |
|
|
|
openView: false, |
|
|
|
versionValue: "", |
|
|
|
@ -630,16 +689,20 @@ export default { |
|
|
|
searchContent: "", // 输入内容 |
|
|
|
form: {}, |
|
|
|
formCount: { |
|
|
|
name: "未结算对比", |
|
|
|
// datetime5: [], |
|
|
|
// datetime7: [], |
|
|
|
settledate: "", |
|
|
|
materialCode: "", |
|
|
|
sapMaterialCode: "", |
|
|
|
chassisNumber: "", |
|
|
|
kennCode: "", |
|
|
|
version: "", |
|
|
|
startTime: "", |
|
|
|
endTime: "", |
|
|
|
cp5startTime: "", |
|
|
|
cp5endTime: "", |
|
|
|
// name: "未结算对比", |
|
|
|
// settledate: "", |
|
|
|
// materialCode: "", |
|
|
|
// sapMaterialCode: "", |
|
|
|
// chassisNumber: "", |
|
|
|
// kennCode: "", |
|
|
|
// version: "", |
|
|
|
}, |
|
|
|
cp5startTime: "", |
|
|
|
cp5endTime: "", |
|
|
|
list: null, |
|
|
|
totalCount: 0, |
|
|
|
listLoading: true, |
|
|
|
@ -724,7 +787,7 @@ export default { |
|
|
|
tempsTabs.push({ |
|
|
|
label: "单据流水号", |
|
|
|
prop: "taskId", |
|
|
|
width: 85, |
|
|
|
width: 130, |
|
|
|
}); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "模块名称", |
|
|
|
@ -746,13 +809,8 @@ export default { |
|
|
|
prop: "remark", |
|
|
|
width: 220, |
|
|
|
}); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "操作名称", |
|
|
|
// prop: "actionName", |
|
|
|
// width: 120, |
|
|
|
// }); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "状态", |
|
|
|
label: "审批状态", |
|
|
|
prop: "fileName", |
|
|
|
width: 150, |
|
|
|
}); |
|
|
|
@ -760,6 +818,15 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
//cp5 |
|
|
|
getdateValueCp5(val) { |
|
|
|
this.cp5startTime = val; |
|
|
|
this.getbalanceIndexData(); |
|
|
|
}, |
|
|
|
getdateValCp5(val) { |
|
|
|
this.cp5endTime = val; |
|
|
|
this.getbalanceIndexData(); |
|
|
|
}, |
|
|
|
handleSelectionChange(val) { |
|
|
|
this.multipleSelection = val; |
|
|
|
}, |
|
|
|
@ -812,7 +879,7 @@ export default { |
|
|
|
}); |
|
|
|
}); |
|
|
|
}, |
|
|
|
handleConfirm(row){ |
|
|
|
handleConfirm(row) { |
|
|
|
if (this.multipleSelection.length == 0) { |
|
|
|
this.$message({ |
|
|
|
message: "至少选择一行！", |
|
|
|
@ -994,20 +1061,20 @@ export default { |
|
|
|
this.listLoading = false; |
|
|
|
}); |
|
|
|
}, |
|
|
|
//获取物料组车型 |
|
|
|
getMaterialGroup() { |
|
|
|
this.$axios |
|
|
|
.posts("/api/settleaccount/CodeSetting/list", { |
|
|
|
project: "物料组", |
|
|
|
maxResultCount: 1000, |
|
|
|
skipCount: 0, |
|
|
|
sorting: "value ascending", |
|
|
|
}) |
|
|
|
.then((response) => { |
|
|
|
this.materialGroupList = []; |
|
|
|
response.items.forEach((element) => { |
|
|
|
let options = {}; |
|
|
|
options.value = element.description; |
|
|
|
options.label = element.description; |
|
|
|
options.label = element.value; |
|
|
|
this.materialGroupList.push(options); |
|
|
|
}); |
|
|
|
}) |
|
|
|
@ -1021,7 +1088,8 @@ export default { |
|
|
|
this.datetime5 = []; |
|
|
|
this.startTime = ""; |
|
|
|
this.endTime = ""; |
|
|
|
// this.datetime7 = []; |
|
|
|
this.cp5startTime = ""; |
|
|
|
this.cp5endTime = ""; |
|
|
|
}, |
|
|
|
save() { |
|
|
|
this.$refs.formCount.validate((valid) => { |
|
|
|
@ -1031,22 +1099,18 @@ export default { |
|
|
|
if (this.formCount.materialCode != "") { |
|
|
|
this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 |
|
|
|
} |
|
|
|
// if (this.formCount.sapMaterialCode != "") { |
|
|
|
// this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号 |
|
|
|
// } |
|
|
|
if (this.formCount.sapCode != "") { |
|
|
|
this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号 |
|
|
|
} |
|
|
|
if (this.formCount.kennCode != "") { |
|
|
|
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 |
|
|
|
} |
|
|
|
var getdate5 = JSON.stringify(this.datetime5); |
|
|
|
if (getdate5 != "[]") { |
|
|
|
alert(this.datetime5[0]); |
|
|
|
this.listExportQuery.begin = this.datetime5 |
|
|
|
? this.datetime5[0] || undefined |
|
|
|
: undefined; |
|
|
|
this.listExportQuery.end = this.datetime5 |
|
|
|
? this.datetime5[1] || undefined |
|
|
|
: undefined; |
|
|
|
} |
|
|
|
this.listExportQuery.begin = this.cp5startTime |
|
|
|
? this.cp5startTime |
|
|
|
: undefined; |
|
|
|
this.listExportQuery.end = this.cp5endTime |
|
|
|
? this.cp5endTime |
|
|
|
: undefined; |
|
|
|
if (this.startTime != "") { |
|
|
|
this.listExportQuery.cp7begin = this.startTime; //CP7开始时间 |
|
|
|
} |
|
|
|
@ -1057,8 +1121,7 @@ export default { |
|
|
|
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 |
|
|
|
} |
|
|
|
if (this.formCount.materialGroupValue != "") { |
|
|
|
this.listExportQuery.materialGroup = |
|
|
|
this.formCount.materialGroupValue; //物料组车型 |
|
|
|
this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型 |
|
|
|
} |
|
|
|
console.log( |
|
|
|
"大众备件结算核对-导出条件：" + JSON.stringify(this.listExportQuery) |
|
|
|
@ -1096,6 +1159,11 @@ export default { |
|
|
|
this.formTitle = "报表统计"; |
|
|
|
this.isEdit = false; |
|
|
|
this.form = {}; |
|
|
|
this.datetime5 = []; |
|
|
|
this.startTime = ""; |
|
|
|
this.endTime = ""; |
|
|
|
this.cp5startTime = ""; |
|
|
|
this.cp5endTime = ""; |
|
|
|
this.dialogFormVisible = true; |
|
|
|
}, |
|
|
|
filterHandler(value, row, column) { |
|
|
|
|
44673626
3 years ago