PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

前端功能条件更改

branch_ccpg_220107
44673626 4 years ago
parent
6ca0d9e51f
commit
f05458e128
4 changed files with 186 additions and 161 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
  2. 37
      vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
  3. 86
      vue/src/views/ux/billManage/IssuedUnsettled/index.vue
  4. 147
      vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue

77
vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
View File

@ -33,7 +33,7 @@
</el-tooltip> </el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right" <span style="margin-left: 10px; color: #ff5640; float: right"
>说明：每间隔30秒进行自动刷新！</span >说明：每间隔15秒进行自动刷新！</span
> >
</flexbox> </flexbox>
</div> </div>
@ -413,9 +413,9 @@
<el-form-item label="CP7时间：" /> <el-form-item label="CP7时间：" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item prop="startTime">
<el-date-picker <el-date-picker
v-model="startTime" v-model="formCount.startTime"
type="datetime" type="datetime"
size="small" size="small"
:picker-options="pickerOptions0" :picker-options="pickerOptions0"
@ -427,9 +427,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -40px"> <el-col :md="10" :xs="24" style="margin-left: -40px">
<el-form-item> <el-form-item prop="endTime">
<el-date-picker <el-date-picker
v-model="endTime" v-model="formCount.endTime"
type="datetime" type="datetime"
:picker-options="pickerOptions1" :picker-options="pickerOptions1"
size="small" size="small"
@ -447,7 +447,7 @@
<el-form-item label="KEEN号" /> <el-form-item label="KEEN号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item prop="kennCode">
<el-input v-model="formCount.kennCode" /> <el-input v-model="formCount.kennCode" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -455,7 +455,7 @@
<el-form-item label="底盘号" /> <el-form-item label="底盘号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item> <el-form-item prop="chassisNumber">
<el-input v-model="formCount.chassisNumber" /> <el-input v-model="formCount.chassisNumber" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -465,19 +465,19 @@
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="客户零件号" /> <el-form-item label="客户零件号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" /> <el-input v-model="formCount.materialCode" style="width:450px"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="4" :xs="24"> <!-- <el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" /> <el-form-item label="厂内零件号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item> <el-form-item prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" /> <el-input v-model="formCount.sapMaterialCode" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -546,8 +546,8 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime(); return time.getTime() <= new Date(this.startTime).getTime();
}, },
}, },
startTime: "", // startTime: "",
endTime: "", // endTime: "",
pickerOptionsCp7: { pickerOptionsCp7: {
disabledDate: (time) => { disabledDate: (time) => {
let now = new Date(); let now = new Date();
@ -562,7 +562,6 @@ export default {
}, },
}, },
datetime5: [], datetime5: [],
datetime7: [],
checkedCities: [0], checkedCities: [0],
cities: cityOptions, cities: cityOptions,
selectValue: "", selectValue: "",
@ -599,15 +598,15 @@ export default {
searchContent: "", // 输入内容 searchContent: "", // 输入内容
form: {}, form: {},
formCount: { formCount: {
name: "未结算对比", startTime: "",
// datetime5: [], endTime: "",
// datetime7: [], // name: "未结算对比",
settledate: "", // settledate: "",
materialCode: "", // materialCode: "",
sapMaterialCode: "", // sapMaterialCode: "",
chassisNumber: "", // chassisNumber: "",
kennCode: "", // kennCode: "",
version: "", // version: "",
}, },
list: null, list: null,
totalCount: 0, totalCount: 0,
@ -662,7 +661,7 @@ export default {
this.listQuery.taskId = ""; this.listQuery.taskId = "";
this.listQuery.stateName = ""; this.listQuery.stateName = "";
setTimeout(this.getList, 0); setTimeout(this.getList, 0);
}, 1000 * 30); //30秒刷新一次页面 }, 1000 * 15); //15秒刷新一次页面
// 通过$once来监听定时器，在beforeDestroy钩子可以被清除。 // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
this.$once("hook:beforeDestroy", () => { this.$once("hook:beforeDestroy", () => {
clearInterval(timer); clearInterval(timer);
@ -792,7 +791,6 @@ export default {
this.datetime5 = []; this.datetime5 = [];
this.startTime = ""; this.startTime = "";
this.endTime = ""; this.endTime = "";
// this.datetime7 = [];
}, },
save() { save() {
this.$refs.formCount.validate((valid) => { this.$refs.formCount.validate((valid) => {
@ -802,28 +800,29 @@ export default {
if (this.formCount.materialCode != "") { if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
} }
if (this.formCount.sapMaterialCode != "") { // if (this.formCount.sapMaterialCode != "") {
this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号 // this.listExportQuery.sapMaterialCode =
} // this.formCount.sapMaterialCode; //厂内物料号
// }
if (this.formCount.kennCode != "") { if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
} }
var getdate5 = JSON.stringify(this.datetime5); var getdate5 = JSON.stringify(this.datetime5);
if (getdate5 != "[]") { if (getdate5 != "[]") {
alert(this.datetime5[0]);
this.listExportQuery.begin = this.datetime5 this.listExportQuery.begin = this.datetime5
? this.datetime5[0] || undefined ? this.datetime5[0] || undefined
: undefined; : undefined;
this.listExportQuery.end = this.datetime5 this.listExportQuery.end = this.datetime5
? this.datetime5[1] || undefined ? this.datetime5[1] || undefined
: undefined; : undefined;
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
} }
if (this.startTime != "") { this.listExportQuery.cp7begin = this.startTime
this.listExportQuery.cp7begin = this.startTime; //CP7开始时间 ? this.startTime
} : undefined;
if (this.endTime != "") { this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
this.listExportQuery.cp7end = this.endTime; //CP5结束日期
}
if (this.formCount.chassisNumber != "") { if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
} }
@ -868,8 +867,12 @@ export default {
this.formTitle = "报表统计"; this.formTitle = "报表统计";
this.isEdit = false; this.isEdit = false;
this.form = {}; this.form = {};
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.dialogFormVisible = true; this.dialogFormVisible = true;
}, },
filterHandler(value, row, column) { filterHandler(value, row, column) {
const property = column["property"]; const property = column["property"];
return row[property] === value; return row[property] === value;

37
vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
View File

@ -33,7 +33,7 @@
</el-tooltip> </el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right" <span style="margin-left: 10px; color: #ff5640; float: right"
>说明：每间隔30秒进行自动刷新！</span >说明：每间隔15秒进行自动刷新！</span
> >
</flexbox> </flexbox>
</div> </div>
@ -333,7 +333,13 @@
append-to-body append-to-body
width="680px" width="680px"
> >
<el-form ref="formCount" :inline="true" :rules="rules" :model="formCount" size="mini"> <el-form
ref="formCount"
:inline="true"
:rules="rules"
:model="formCount"
size="mini"
>
<el-row> <el-row>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="选择版本" required /> <el-form-item label="选择版本" required />
@ -358,17 +364,15 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="客户零件号" /> <el-form-item label="客户零件号" />
</el-col> </el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px"> <el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" style="width:300px"/> <el-input v-model="formCount.materialCode" style="width: 300px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -553,7 +557,7 @@ export default {
this.listQuery.taskId = ""; this.listQuery.taskId = "";
this.listQuery.stateName = ""; this.listQuery.stateName = "";
setTimeout(this.getList, 0); setTimeout(this.getList, 0);
}, 1000 * 30); //30秒刷新一次页面 }, 1000 * 15); //15秒刷新一次页面
// 通过$once来监听定时器，在beforeDestroy钩子可以被清除。 // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
this.$once("hook:beforeDestroy", () => { this.$once("hook:beforeDestroy", () => {
clearInterval(timer); clearInterval(timer);
@ -680,19 +684,19 @@ export default {
/* 重置 */ /* 重置 */
resetForm(formName) { resetForm(formName) {
this.formCount = {}; this.formCount = {};
this.datetime5 = []; //this.formCount.materialCode = "";
this.startTime = "";
this.endTime = "";
// this.datetime7 = [];
}, },
save() { save() {
this.$refs.formCount.validate((valid) => { this.$refs.formCount.validate((valid) => {
if (valid) { if (valid) {
this.formLoading = true; this.formLoading = true;
this.listExportQuery.version = this.formCount.versionValue; //版本 this.listExportQuery.version = this.formCount.versionValue; //版本
if (this.formCount.materialCode != "") { this.listExportQuery.matialCode = this.formCount.materialCode
this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 ? this.formCount.materialCode
} : undefined;
// if (this.formCount.materialCode != "") {
// this.listExportQuery.matialCode = this.formCount.materialCode; //物料号
// }
// if (this.formCount.kennCode != "") { // if (this.formCount.kennCode != "") {
// this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 // this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
// } // }
@ -719,7 +723,10 @@ export default {
// this.listExportQuery.materialGroup = // this.listExportQuery.materialGroup =
// this.formCount.materialGroupValue; //物料组车型 // this.formCount.materialGroupValue; //物料组车型
// } // }
console.log("发票与结算核对汇总-导出条件：" + JSON.stringify(this.listExportQuery)); console.log(
"发票与结算核对汇总-导出条件：" +
JSON.stringify(this.listExportQuery)
);
this.$axios this.$axios
.gets( .gets(
"/api/settleaccount/ReportMakeService/InvoiceSettledDiff-Make", "/api/settleaccount/ReportMakeService/InvoiceSettledDiff-Make",

86
vue/src/views/ux/billManage/IssuedUnsettled/index.vue
View File

@ -33,7 +33,7 @@
</el-tooltip> </el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right" <span style="margin-left: 10px; color: #ff5640; float: right"
>说明：每间隔30秒进行自动刷新！</span >说明：每间隔15秒进行自动刷新！</span
> >
</flexbox> </flexbox>
</div> </div>
@ -408,14 +408,14 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row> <el-row>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="CP7时间：" /> <el-form-item label="CP7时间：" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item prop="startTime">
<el-date-picker <el-date-picker
v-model="startTime" v-model="formCount.startTime"
type="datetime" type="datetime"
size="small" size="small"
:picker-options="pickerOptions0" :picker-options="pickerOptions0"
@ -427,9 +427,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -40px"> <el-col :md="10" :xs="24" style="margin-left: -40px">
<el-form-item> <el-form-item prop="endTime">
<el-date-picker <el-date-picker
v-model="endTime" v-model="formCount.endTime"
type="datetime" type="datetime"
:picker-options="pickerOptions1" :picker-options="pickerOptions1"
size="small" size="small"
@ -447,7 +447,7 @@
<el-form-item label="KEEN号" /> <el-form-item label="KEEN号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item prop="kennCode">
<el-input v-model="formCount.kennCode" /> <el-input v-model="formCount.kennCode" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -455,29 +455,29 @@
<el-form-item label="底盘号" /> <el-form-item label="底盘号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item> <el-form-item prop="chassisNumber">
<el-input v-model="formCount.chassisNumber" /> <el-input v-model="formCount.chassisNumber" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> --> </el-row>
<el-row> <el-row>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="客户零件号" /> <el-form-item label="客户零件号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" /> <el-input v-model="formCount.materialCode" style="width: 450px" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="4" :xs="24"> <!-- <el-col :md="4" :xs="24">
<el-form-item label="客户零件号" /> <el-form-item label="厂内零件号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item> <el-form-item prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" /> <el-input v-model="formCount.sapMaterialCode" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -546,8 +546,8 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime(); return time.getTime() <= new Date(this.startTime).getTime();
}, },
}, },
startTime: "", // startTime: "",
endTime: "", // endTime: "",
pickerOptionsCp7: { pickerOptionsCp7: {
disabledDate: (time) => { disabledDate: (time) => {
let now = new Date(); let now = new Date();
@ -562,7 +562,6 @@ export default {
}, },
}, },
datetime5: [], datetime5: [],
datetime7: [],
checkedCities: [0], checkedCities: [0],
cities: cityOptions, cities: cityOptions,
selectValue: "", selectValue: "",
@ -599,15 +598,15 @@ export default {
searchContent: "", // 输入内容 searchContent: "", // 输入内容
form: {}, form: {},
formCount: { formCount: {
name: "未结算对比", startTime: "",
// datetime5: [], endTime: "",
// datetime7: [], // name: "未结算对比",
settledate: "", // settledate: "",
materialCode: "", // materialCode: "",
sapMaterialCode: "", // sapMaterialCode: "",
chassisNumber: "", // chassisNumber: "",
kennCode: "", // kennCode: "",
version: "", // version: "",
}, },
list: null, list: null,
totalCount: 0, totalCount: 0,
@ -662,7 +661,7 @@ export default {
this.listQuery.taskId = ""; this.listQuery.taskId = "";
this.listQuery.stateName = ""; this.listQuery.stateName = "";
setTimeout(this.getList, 0); setTimeout(this.getList, 0);
}, 1000 * 30); //30秒刷新一次页面 }, 1000 * 15); //15秒刷新一次页面
// 通过$once来监听定时器，在beforeDestroy钩子可以被清除。 // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
this.$once("hook:beforeDestroy", () => { this.$once("hook:beforeDestroy", () => {
clearInterval(timer); clearInterval(timer);
@ -792,7 +791,6 @@ export default {
this.datetime5 = []; this.datetime5 = [];
this.startTime = ""; this.startTime = "";
this.endTime = ""; this.endTime = "";
// this.datetime7 = [];
}, },
save() { save() {
this.$refs.formCount.validate((valid) => { this.$refs.formCount.validate((valid) => {
@ -802,28 +800,29 @@ export default {
if (this.formCount.materialCode != "") { if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
} }
if (this.formCount.sapMaterialCode != "") { // if (this.formCount.sapMaterialCode != "") {
this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号 // this.listExportQuery.sapMaterialCode =
} // this.formCount.sapMaterialCode; //厂内物料号
// }
if (this.formCount.kennCode != "") { if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
} }
var getdate5 = JSON.stringify(this.datetime5); var getdate5 = JSON.stringify(this.datetime5);
if (getdate5 != "[]") { if (getdate5 != "[]") {
alert(this.datetime5[0]);
this.listExportQuery.begin = this.datetime5 this.listExportQuery.begin = this.datetime5
? this.datetime5[0] || undefined ? this.datetime5[0] || undefined
: undefined; : undefined;
this.listExportQuery.end = this.datetime5 this.listExportQuery.end = this.datetime5
? this.datetime5[1] || undefined ? this.datetime5[1] || undefined
: undefined; : undefined;
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
} }
if (this.startTime != "") { this.listExportQuery.cp7begin = this.startTime
this.listExportQuery.cp7begin = this.startTime; //CP7开始时间 ? this.startTime
} : undefined;
if (this.endTime != "") { this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
this.listExportQuery.cp7end = this.endTime; //CP5结束日期
}
if (this.formCount.chassisNumber != "") { if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
} }
@ -831,6 +830,7 @@ export default {
this.listExportQuery.materialGroup = this.listExportQuery.materialGroup =
this.formCount.materialGroupValue; //物料组车型 this.formCount.materialGroupValue; //物料组车型
} }
console.log( console.log(
"大众准时化未结明细-导出条件：" + "大众准时化未结明细-导出条件：" +
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)
@ -868,8 +868,12 @@ export default {
this.formTitle = "报表统计"; this.formTitle = "报表统计";
this.isEdit = false; this.isEdit = false;
this.form = {}; this.form = {};
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.dialogFormVisible = true; this.dialogFormVisible = true;
}, },
filterHandler(value, row, column) { filterHandler(value, row, column) {
const property = column["property"]; const property = column["property"];
return row[property] === value; return row[property] === value;
@ -982,7 +986,7 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
//导入界面中超链接过来的参数 //导入界面中超链接过来的参数
this.listQuery.name = "大众准时化未结明细表"; this.listQuery.name = "大众发票与结算核对明细表";
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {

147
vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue
View File

@ -33,7 +33,7 @@
</el-tooltip> </el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right" <span style="margin-left: 10px; color: #ff5640; float: right"
>说明：每间隔30秒进行自动刷新！</span >说明：每间隔15秒进行自动刷新！</span
> >
</flexbox> </flexbox>
</div> </div>
@ -333,7 +333,13 @@
append-to-body append-to-body
width="680px" width="680px"
> >
<el-form ref="formCount" :inline="true" :rules="rules" :model="formCount" size="mini"> <el-form
ref="formCount"
:inline="true"
:rules="rules"
:model="formCount"
size="mini"
>
<el-row> <el-row>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="选择版本" required /> <el-form-item label="选择版本" required />
@ -357,25 +363,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :md="4" :xs="24">
<el-form-item label="客户零件号" />
</el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-input v-model="formCount.materialCode" style="width:300px"/>
</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.sapMaterialCode" />
</el-form-item>
</el-col> -->
</el-row>
<!-- <el-row>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="物料组(车型)" /> <el-form-item label="物料组(车型)" />
</el-col> </el-col>
@ -398,7 +386,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> --> </el-row>
<el-row> <el-row>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
@ -425,9 +413,9 @@
<el-form-item label="CP7时间：" /> <el-form-item label="CP7时间：" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item prop="startTime">
<el-date-picker <el-date-picker
v-model="startTime" v-model="formCount.startTime"
type="datetime" type="datetime"
size="small" size="small"
:picker-options="pickerOptions0" :picker-options="pickerOptions0"
@ -439,9 +427,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -40px"> <el-col :md="10" :xs="24" style="margin-left: -40px">
<el-form-item> <el-form-item prop="endTime">
<el-date-picker <el-date-picker
v-model="endTime" v-model="formCount.endTime"
type="datetime" type="datetime"
:picker-options="pickerOptions1" :picker-options="pickerOptions1"
size="small" size="small"
@ -459,7 +447,7 @@
<el-form-item label="KEEN号" /> <el-form-item label="KEEN号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item prop="kennCode">
<el-input v-model="formCount.kennCode" /> <el-input v-model="formCount.kennCode" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -467,13 +455,30 @@
<el-form-item label="底盘号" /> <el-form-item label="底盘号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item> <el-form-item prop="chassisNumber">
<el-input v-model="formCount.chassisNumber" /> <el-input v-model="formCount.chassisNumber" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="客户零件号" />
</el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" style="width:450px"/>
</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 prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" />
</el-form-item>
</el-col> -->
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<!-- <el-button type="text" @click="dialogFormVisible = false" <!-- <el-button type="text" @click="dialogFormVisible = false"
@ -494,7 +499,12 @@ import permission from "@/directive/permission/index.js";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
import CRMTableHead from "../../components/CRMTableHead"; import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment"; import moment from "moment";
const cityOptions = [
{ id: 0, name: "未结" },
{ id: 1, name: "部分结算" },
{ id: 2, name: "已结" },
/* { id: 3, name: "预批量" }, */
];
export default { export default {
name: "UnInvoiceSettledDetailDiff", name: "UnInvoiceSettledDetailDiff",
@ -536,8 +546,8 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime(); return time.getTime() <= new Date(this.startTime).getTime();
}, },
}, },
startTime: "", // startTime: "",
endTime: "", // endTime: "",
pickerOptionsCp7: { pickerOptionsCp7: {
disabledDate: (time) => { disabledDate: (time) => {
let now = new Date(); let now = new Date();
@ -552,8 +562,8 @@ export default {
}, },
}, },
datetime5: [], datetime5: [],
datetime7: [],
checkedCities: [0], checkedCities: [0],
cities: cityOptions,
selectValue: "", selectValue: "",
selectNameValue: "", selectNameValue: "",
radio: "0", //结算状态：0未结 1部分结算 radio: "0", //结算状态：0未结 1部分结算
@ -588,15 +598,15 @@ export default {
searchContent: "", // 输入内容 searchContent: "", // 输入内容
form: {}, form: {},
formCount: { formCount: {
name: "未结算对比", startTime: "",
// datetime5: [], endTime: "",
// datetime7: [], // name: "未结算对比",
settledate: "", // settledate: "",
materialCode: "", // materialCode: "",
sapMaterialCode: "", // sapMaterialCode: "",
chassisNumber: "", // chassisNumber: "",
kennCode: "", // kennCode: "",
version: "", // version: "",
}, },
list: null, list: null,
totalCount: 0, totalCount: 0,
@ -651,7 +661,7 @@ export default {
this.listQuery.taskId = ""; this.listQuery.taskId = "";
this.listQuery.stateName = ""; this.listQuery.stateName = "";
setTimeout(this.getList, 0); setTimeout(this.getList, 0);
}, 1000 * 30); //30秒刷新一次页面 }, 1000 * 15); //15秒刷新一次页面
// 通过$once来监听定时器，在beforeDestroy钩子可以被清除。 // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
this.$once("hook:beforeDestroy", () => { this.$once("hook:beforeDestroy", () => {
clearInterval(timer); clearInterval(timer);
@ -662,8 +672,6 @@ export default {
this.getAllVersionList(); this.getAllVersionList();
this.getMaterialGroup(); this.getMaterialGroup();
this.getList(); this.getList();
// this.getCurrentMonthFirst();
// this.getCurrentMonthLast();
}, },
beforeDestroy() { beforeDestroy() {
clearInterval(this.timer); clearInterval(this.timer);
@ -694,16 +702,6 @@ export default {
prop: "createdAt", prop: "createdAt",
width: 150, width: 150,
}); });
// tempsTabs.push({
// label: "操作名称",
// prop: "actionName",
// width: 120,
// });
// tempsTabs.push({
// label: "状态",
// prop: "stateName",
// width: 100,
// });
return tempsTabs; return tempsTabs;
}, },
}, },
@ -781,7 +779,6 @@ export default {
this.datetime5 = []; this.datetime5 = [];
this.startTime = ""; this.startTime = "";
this.endTime = ""; this.endTime = "";
// this.datetime7 = [];
}, },
save() { save() {
this.$refs.formCount.validate((valid) => { this.$refs.formCount.validate((valid) => {
@ -791,33 +788,42 @@ export default {
if (this.formCount.materialCode != "") { if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
} }
// if (this.formCount.sapMaterialCode != "") {
// this.listExportQuery.sapMaterialCode =
// this.formCount.sapMaterialCode; //厂内物料号
// }
if (this.formCount.kennCode != "") { if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
} }
var getdate5 = JSON.stringify(this.datetime5); var getdate5 = JSON.stringify(this.datetime5);
if (getdate5 != "[]") { if (getdate5 != "[]") {
alert(this.datetime5[0]);
this.listExportQuery.begin = this.datetime5 this.listExportQuery.begin = this.datetime5
? this.datetime5[0] || undefined ? this.datetime5[0] || undefined
: undefined; : undefined;
this.listExportQuery.end = this.datetime5 this.listExportQuery.end = this.datetime5
? this.datetime5[1] || undefined ? this.datetime5[1] || undefined
: undefined; : undefined;
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
} }
if (this.startTime != "") { this.listExportQuery.cp7begin = this.startTime
this.listExportQuery.cp7begin = this.startTime; //CP7开始时间 ? this.startTime
} : undefined;
if (this.endTime != "") { this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
this.listExportQuery.cp7end = this.endTime; //CP5结束日期
}
if (this.formCount.chassisNumber != "") { if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
} }
// if (this.formCount.materialGroupValue != "") { if (this.formCount.materialGroupValue != "") {
// this.listExportQuery.materialGroup = this.listExportQuery.materialGroup =
// this.formCount.materialGroupValue; //物料组车型 this.formCount.materialGroupValue; //物料组车型
// } }
console.log("准时化结算数量差异比对-导出条件：" + JSON.stringify(this.listExportQuery)); console.log(
"准时化结算数量差异比对-导出条件：" +
JSON.stringify(this.listExportQuery)
);
// this.formLoading = false;
// this.dialogFormVisible = false;
this.$axios this.$axios
.gets( .gets(
"/api/settleaccount/ReportMakeService/UnInvoiceSettledDetailDiff-Make", "/api/settleaccount/ReportMakeService/UnInvoiceSettledDetailDiff-Make",
@ -851,8 +857,12 @@ export default {
this.formTitle = "报表统计"; this.formTitle = "报表统计";
this.isEdit = false; this.isEdit = false;
this.form = {}; this.form = {};
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.dialogFormVisible = true; this.dialogFormVisible = true;
}, },
filterHandler(value, row, column) { filterHandler(value, row, column) {
const property = column["property"]; const property = column["property"];
return row[property] === value; return row[property] === value;
@ -1030,3 +1040,4 @@ export default {
} }
</style> </style>

Write Preview
Loading…
Cancel
Save