|
|
|
@ -8,21 +8,14 @@ |
|
|
|
class="search-container" |
|
|
|
@value-change="JobVersionValue" |
|
|
|
></JobSelectVerson> |
|
|
|
<!-- <el-button |
|
|
|
class="filter-item" |
|
|
|
size="mini" |
|
|
|
type="warning" |
|
|
|
icon="el-icon-upload2" |
|
|
|
@click="handleImportExcel()" |
|
|
|
>导入文件（Excel） |
|
|
|
</el-button> --> |
|
|
|
|
|
|
|
<el-button |
|
|
|
class="filter-item" |
|
|
|
size="mini" |
|
|
|
type="warning" |
|
|
|
icon="el-icon-plus" |
|
|
|
@click="handleCreate" |
|
|
|
>生成出库数据 |
|
|
|
>生成数据 |
|
|
|
</el-button> |
|
|
|
<el-button |
|
|
|
class="filter-item" |
|
|
|
@ -34,15 +27,44 @@ |
|
|
|
</el-button> |
|
|
|
|
|
|
|
<el-select |
|
|
|
v-model="listQuery.state" |
|
|
|
@change="selectState" |
|
|
|
placeholder="请选择过滤状态" |
|
|
|
v-model="selectClient" |
|
|
|
clearable |
|
|
|
@change="SelectClient" |
|
|
|
placeholder="客户" |
|
|
|
style="width: 100px; margin-left: 8px" |
|
|
|
> |
|
|
|
<el-option label="大众" value="大众"></el-option> |
|
|
|
<el-option label="红旗" value="红旗"></el-option> |
|
|
|
<!-- <el-option label="红旗" value="红旗"></el-option> --> |
|
|
|
</el-select> |
|
|
|
|
|
|
|
<el-select |
|
|
|
v-model="selectType" |
|
|
|
clearable |
|
|
|
@change="SelectType" |
|
|
|
placeholder="请选择" |
|
|
|
style="width: 200px; margin-left: 8px" |
|
|
|
> |
|
|
|
<el-option label="新建" :value="0"></el-option> |
|
|
|
<el-option label="已申请" :value="1"></el-option> |
|
|
|
<el-option label="成功" :value="2"></el-option> |
|
|
|
<el-option label="失败" :value="3"></el-option> |
|
|
|
<el-option label="大众准时化出库" value="大众准时化出库"></el-option> |
|
|
|
<el-option label="大众看板出库" value="大众看板出库"></el-option> |
|
|
|
<el-option |
|
|
|
label="大众备件条码出库" |
|
|
|
value="大众备件条码出库" |
|
|
|
></el-option> |
|
|
|
<el-option label="红旗看板出库" value="红旗看板出库"></el-option> |
|
|
|
<el-option label="大众无看板出库" value="大众无看板出库"></el-option> |
|
|
|
<el-option |
|
|
|
label="大众备件汇总出库" |
|
|
|
value="大众备件汇总出库" |
|
|
|
></el-option> |
|
|
|
<el-option |
|
|
|
label="红旗一轿手工出库" |
|
|
|
value="红旗一轿手工出库" |
|
|
|
></el-option> |
|
|
|
<el-option |
|
|
|
label="红旗一轿手工出库(备件)" |
|
|
|
value="红旗一轿手工出库(备件)" |
|
|
|
></el-option> |
|
|
|
</el-select> |
|
|
|
|
|
|
|
<el-input |
|
|
|
@ -98,7 +120,7 @@ |
|
|
|
@selection-change="handleSelectionChange" |
|
|
|
@row-click="handleRowClick" |
|
|
|
> |
|
|
|
<!-- <el-table-column type="selection" width="44px"></el-table-column> --> |
|
|
|
<el-table-column type="selection" width="44px"></el-table-column> |
|
|
|
<el-table-column |
|
|
|
label="版本" |
|
|
|
prop="version" |
|
|
|
@ -185,22 +207,7 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
<!-- <el-row> |
|
|
|
<el-col :md="4" :xs="24"> |
|
|
|
<el-form-item label="过账日期" required /> |
|
|
|
</el-col> |
|
|
|
<el-col :md="20" :xs="24"> |
|
|
|
<el-form-item prop="dataValue"> |
|
|
|
<el-date-picker |
|
|
|
v-model="dataValue" |
|
|
|
style="width: 188px" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
placeholder="选择日期" |
|
|
|
/> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> --> |
|
|
|
|
|
|
|
</el-form> |
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
<el-button type="text" @click="dialogFormVisible = false" |
|
|
|
@ -212,48 +219,6 @@ |
|
|
|
> |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-dialog |
|
|
|
:visible.sync="dialogAccounDateVisible" |
|
|
|
:close-on-click-modal="false" |
|
|
|
:title="formTitle" |
|
|
|
append-to-body |
|
|
|
width="680px" |
|
|
|
> |
|
|
|
<el-form |
|
|
|
ref="formCount" |
|
|
|
:inline="true" |
|
|
|
:rules="rules" |
|
|
|
:model="formCount" |
|
|
|
size="mini" |
|
|
|
> |
|
|
|
<el-row> |
|
|
|
<el-col :md="4" :xs="24"> |
|
|
|
<el-form-item label="过账日期" required /> |
|
|
|
</el-col> |
|
|
|
<el-col :md="20" :xs="24"> |
|
|
|
<el-form-item prop="dataValue"> |
|
|
|
<el-date-picker |
|
|
|
v-model="dataValue" |
|
|
|
style="width: 188px" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
placeholder="选择日期" |
|
|
|
/> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
<el-button type="text" @click="dialogAccounDateVisible = false" |
|
|
|
>取消</el-button |
|
|
|
> |
|
|
|
<!-- <el-button @click="resetForm('formCount')">重置</el-button> --> |
|
|
|
<el-button v-loading="formLoading" type="primary" @click="saveDate" |
|
|
|
>确认</el-button |
|
|
|
> |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
|
|
|
|
@ -295,6 +260,7 @@ export default { |
|
|
|
versionValue: "", |
|
|
|
dataValue: "", |
|
|
|
versionList: [], //版本列表 |
|
|
|
selectClient: "", |
|
|
|
JobVersionList: [], |
|
|
|
rules: { |
|
|
|
//前端定义的规则，后端也有验证 |
|
|
|
@ -392,50 +358,31 @@ export default { |
|
|
|
}, |
|
|
|
computed: { |
|
|
|
/** 列表字段 */ |
|
|
|
|
|
|
|
getDefaultField() { |
|
|
|
var tempsTabs = []; |
|
|
|
tempsTabs.push({ label: "状态", prop: "state", width: 180 }); |
|
|
|
tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 }); |
|
|
|
tempsTabs.push({ label: "版本号", prop: "version", width: 150 }); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "客户", |
|
|
|
prop: "client", |
|
|
|
width: 120, |
|
|
|
width: 110, |
|
|
|
}); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "出库类型", |
|
|
|
prop: "type", |
|
|
|
width: 150, |
|
|
|
}); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "结算编码", |
|
|
|
prop: "settleCode", |
|
|
|
width: 150, |
|
|
|
}); |
|
|
|
tempsTabs.push({ label: "销售渠道", prop: "saleCode", width: 120 }); |
|
|
|
tempsTabs.push({ label: "客户代码", prop: "clientCode", width: 120 }); |
|
|
|
tempsTabs.push({ label: "结算单", prop: "billNum", width: 150 }); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "物料号", |
|
|
|
prop: "materialCode", |
|
|
|
width: 150, |
|
|
|
}); |
|
|
|
tempsTabs.push({ label: "结算数量", prop: "qty", width: 150 }); |
|
|
|
tempsTabs.push({ label: "实际出库数量", prop: "outputQty", width: 180 }); |
|
|
|
tempsTabs.push({ label: "结算单", prop: "billNum", width: 180 }); |
|
|
|
tempsTabs.push({ label: "交货编码", prop: "switchCode", width: 180 }); |
|
|
|
|
|
|
|
tempsTabs.push({ label: "结算数量", prop: "qty", width: 120 }); |
|
|
|
tempsTabs.push({ label: "实际出库数量", prop: "outputQty", width: 150 }); |
|
|
|
tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 120 }); |
|
|
|
|
|
|
|
tempsTabs.push({ |
|
|
|
label: "开票单价", |
|
|
|
prop: "price", |
|
|
|
width: 150, |
|
|
|
}); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "结算金额", |
|
|
|
prop: "amt", |
|
|
|
width: 120, |
|
|
|
label: "物料号", |
|
|
|
prop: "materialCode", |
|
|
|
width: 140, |
|
|
|
}); |
|
|
|
tempsTabs.push({ label: "已出库金额", prop: "outPutAmt", width: 150 }); |
|
|
|
tempsTabs.push({ label: "WMS待出库金额", prop: "diffAmt", width: 180 }); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "物料组编码", |
|
|
|
prop: "materialGroupCode", |
|
|
|
@ -444,13 +391,75 @@ export default { |
|
|
|
tempsTabs.push({ |
|
|
|
label: "物料组(车型)", |
|
|
|
prop: "materialGroup", |
|
|
|
width: 320, |
|
|
|
width: 200, |
|
|
|
}); |
|
|
|
tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 420 }); |
|
|
|
tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 380 }); |
|
|
|
tempsTabs.push({ label: "备注", prop: "remark1", width: 220 }); |
|
|
|
|
|
|
|
return tempsTabs; |
|
|
|
}, |
|
|
|
|
|
|
|
// getDefaultField() { |
|
|
|
// var tempsTabs = []; |
|
|
|
// // tempsTabs.push({ label: "状态", prop: "state", width: 180 }); |
|
|
|
// tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 }); |
|
|
|
// // tempsTabs.push({ label: "版本号", prop: "version", width: 150 }); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "客户", |
|
|
|
// prop: "client", |
|
|
|
// width: 120, |
|
|
|
// }); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "出库类型", |
|
|
|
// prop: "type", |
|
|
|
// width: 150, |
|
|
|
// }); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "结算编码", |
|
|
|
// prop: "settleCode", |
|
|
|
// width: 150, |
|
|
|
// }); |
|
|
|
// tempsTabs.push({ label: "销售渠道", prop: "saleCode", width: 120 }); |
|
|
|
// tempsTabs.push({ label: "客户代码", prop: "clientCode", width: 120 }); |
|
|
|
// tempsTabs.push({ label: "交货编码", prop: "switchCode", width: 150 }); |
|
|
|
// tempsTabs.push({ label: "结算单", prop: "billNum", width: 150 }); |
|
|
|
|
|
|
|
// tempsTabs.push({ label: "结算数量", prop: "qty", width: 150 }); |
|
|
|
// tempsTabs.push({ label: "实际出库数量", prop: "outputQty", width: 180 }); |
|
|
|
// tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 120 }); |
|
|
|
|
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "开票单价", |
|
|
|
// prop: "price", |
|
|
|
// width: 150, |
|
|
|
// }); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "结算金额", |
|
|
|
// prop: "amt", |
|
|
|
// width: 120, |
|
|
|
// }); |
|
|
|
// tempsTabs.push({ label: "已出库金额", prop: "outPutAmt", width: 150 }); |
|
|
|
// tempsTabs.push({ label: "WMS待出库金额", prop: "diffAmt", width: 180 }); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "物料号", |
|
|
|
// prop: "materialCode", |
|
|
|
// width: 150, |
|
|
|
// }); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "物料组编码", |
|
|
|
// prop: "materialGroupCode", |
|
|
|
// width: 150, |
|
|
|
// }); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "物料组(车型)", |
|
|
|
// prop: "materialGroup", |
|
|
|
// width: 320, |
|
|
|
// }); |
|
|
|
// tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 420 }); |
|
|
|
// tempsTabs.push({ label: "备注", prop: "remark1", width: 220 }); |
|
|
|
|
|
|
|
// return tempsTabs; |
|
|
|
// }, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
//版本下拉列表选择项 |
|
|
|
@ -459,9 +468,12 @@ export default { |
|
|
|
this.JobversionValue = params.value; |
|
|
|
this.getList(); |
|
|
|
}, |
|
|
|
selectState(params) { |
|
|
|
//版本下拉选择 |
|
|
|
this.listQuery.state = params; |
|
|
|
SelectType(params) { |
|
|
|
this.listQuery.type = params; |
|
|
|
this.getList(); |
|
|
|
}, |
|
|
|
SelectClient(params) { |
|
|
|
this.listQuery.client = params; |
|
|
|
this.getList(); |
|
|
|
}, |
|
|
|
//从期间管理中获取版本数据，生成结算出库用 |
|
|
|
@ -573,46 +585,7 @@ export default { |
|
|
|
} |
|
|
|
}); |
|
|
|
}, |
|
|
|
//同步到SAP |
|
|
|
saveDate() { |
|
|
|
this.$refs.formCount.validate((valid) => { |
|
|
|
if (valid) { |
|
|
|
this.formLoading = true; |
|
|
|
if (this.dataValue === "") { |
|
|
|
this.$message.error("必需选择过账日期！"); |
|
|
|
this.formLoading = false; |
|
|
|
return; |
|
|
|
} |
|
|
|
console.log("日期传值：" + this.dataValue); |
|
|
|
this.$axios |
|
|
|
.posts("/api/settleaccount/WMSOutputDetailDiffReport/Sync", { |
|
|
|
accountDate: this.dataValue, |
|
|
|
}) |
|
|
|
.then((res) => { |
|
|
|
if (res == true) { |
|
|
|
this.$notify({ |
|
|
|
title: "成功", |
|
|
|
message: "数据同步成功！", |
|
|
|
type: "success", |
|
|
|
duration: 2000, |
|
|
|
}); |
|
|
|
this.getList(); |
|
|
|
this.formLoading = false; |
|
|
|
this.dialogAccounDateVisible = false; |
|
|
|
} else { |
|
|
|
this.$message({ |
|
|
|
message: "数据同步失败！", |
|
|
|
type: "warning", |
|
|
|
}); |
|
|
|
} |
|
|
|
}) |
|
|
|
.catch(() => { |
|
|
|
this.formLoading = false; |
|
|
|
this.dialogAccounDateVisible = false; |
|
|
|
}); |
|
|
|
} |
|
|
|
}); |
|
|
|
}, |
|
|
|
|
|
|
|
//导出功能 |
|
|
|
async handleDownload() { |
|
|
|
this.listLoading = true; |
|
|
|
@ -626,7 +599,10 @@ export default { |
|
|
|
// } |
|
|
|
console.log("结算出库单个导出：" + JSON.stringify(this.listQuery)); |
|
|
|
this.$axios |
|
|
|
.posts("/api/settleaccount/WMSOutputDetailDiffReport/Export", this.listQuery) |
|
|
|
.posts( |
|
|
|
"/api/settleaccount/WMSOutputDetailDiffReport/Export", |
|
|
|
this.listQuery |
|
|
|
) |
|
|
|
.then((res) => { |
|
|
|
let fileNameOfProject = res; |
|
|
|
this.$axios |
|
|
|
@ -708,7 +684,7 @@ export default { |
|
|
|
getList(data) { |
|
|
|
this.listLoading = true; |
|
|
|
//this.listQuery.SkipCount = (this.page - 1) * 10; |
|
|
|
if (data != undefined) { |
|
|
|
if (data != undefined) { |
|
|
|
this.listQuery.SkipCount = (this.page - 1) * data.limit; |
|
|
|
} else { |
|
|
|
this.listQuery.SkipCount = (this.page - 1) * 15; |
|
|
|
@ -719,7 +695,7 @@ export default { |
|
|
|
console.log("列表查询条件：" + JSON.stringify(this.listQuery)); |
|
|
|
this.$axios |
|
|
|
.posts( |
|
|
|
"/api/settleaccount/WMSOutputDetailDiffReport/WmsDetailReport", |
|
|
|
"/api/settleaccount/WMSOutputDetailDiffReport/WmsDetailReport", |
|
|
|
this.listQuery |
|
|
|
) |
|
|
|
.then((response) => { |
|
|
|
|
44673626
3 years ago