Browse Source

代码提交

branch_ccpg_220107
44673626 3 years ago
parent
commit
3121232938
  1. 6
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
  2. 2
      vue/src/router/index.js
  3. 20
      vue/src/router/modules/vwFisData.js
  4. 22
      vue/src/router/modules/vwKBdata.js
  5. 298
      vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
  6. 43
      vue/src/views/ux/billManage/IssuedUnsettled/index.vue
  7. 125
      vue/src/views/ux/billManage/UnSettleDiffExport/index.vue
  8. 121
      vue/src/views/ux/billManage/UnSettledDiff/index.vue
  9. 641
      vue/src/views/ux/vw/dataInput/hq_h/index.vue

6
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@ -2663,10 +2663,10 @@
</summary>
<param name="kanBan">看板号</param>
<param name="sapMaterialCode">厂内零件号</param>
<param name="version"></param>
<param name="version">版本</param>
<param name="customerCode"></param>
<param name="customerPartCode">客户物料号</param>
<param name="estimateTypeDesc">t物料组(车型)</param>
<param name="estimateTypeDesc">物料组(车型)</param>
<param name="state"></param>
<param name="begin"></param>
<param name="end"></param>
@ -2728,7 +2728,7 @@
<param name="state"></param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDiffMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDiffMake(System.String,System.String,System.String,System.Collections.Generic.List{System.String},System.String,System.String,System.String)">
<summary>
1.大众发票与结算核对汇总表
</summary>

2
vue/src/router/index.js

@ -173,7 +173,7 @@ export const asyncRoutes = [
billdataRouter,//销售结算与开票报表
//businessdataRouter,
wheeldataRouter,//大众看板和备件
pgfis,//派格fis
//pgfis,//派格fis
JobTimeDataRouter,//后台作业监控
// 404 page must be placed at the end !!!

20
vue/src/router/modules/vwFisData.js

@ -78,16 +78,16 @@ const vwFisDataRouter = {
}
},
// {
// path: '/EP',
// component: () => import('@/views/ux/vw/dataInput/erpei'),
// name: 'ERPEI',//命名路由
// meta: {
// title: '二配结算表',
// roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色)
// icon: '结算'
// }
// },
{
path: 'hq-H-platform',
component: () => import('@/views/ux/vw/dataInput/hq_h'),
name: 'ERPEI',//命名路由
meta: {
title: '红旗H平台导入',
roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色)
icon: '结算'
}
},
]
}

22
vue/src/router/modules/vwKBdata.js

@ -37,7 +37,7 @@ const billdataRouter = {
}
},
{
path: 'unSettle-diffExport',
path: 'unsettle-diff/export',
component: () => import('@/views/ux/billManage/UnSettleDiffExport'),
name: 'UnSettleDiffExport',//命名路由
meta: {
@ -66,16 +66,16 @@ const billdataRouter = {
icon: '结算对比'
}
},
{
path: 'FisUnSettledDiff',
component: () => import('@/views/ux/billManage/FisUnSettledDiff'),
name: 'FisUnSettledDiff',//命名路由
meta: {
title: '准时化交货与结算核对',
roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色)
icon: '看板'
}
},
// {
// path: 'FisUnSettledDiff',
// component: () => import('@/views/ux/billManage/FisUnSettledDiff'),
// name: 'FisUnSettledDiff',//命名路由
// meta: {
// title: '准时化交货与结算核对',
// roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色)
// icon: '看板'
// }
// },
{
path: 'unInvoice-settled/detailDiff',
component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'),

298
vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue

@ -372,9 +372,12 @@
<el-select
v-model="formCount.materialGroupValue"
size="medium"
multiple
collapse-tags
filterable
clearable
style="width: 188px; margin-right: 15px"
style="width: 350px; margin-right: 15px"
@change="valueChange"
placeholder="请选择"
>
<el-option
@ -388,7 +391,7 @@
</el-col>
</el-row>
<el-row>
<!-- <el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP5时间:" />
</el-col>
@ -407,6 +410,37 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row> -->
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP5时间:" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="cp5startTime">
<el-date-picker
v-model="formCount.cp5startTime"
type="datetime"
size="small"
@change="cp5getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
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 prop="cp5endTime">
<el-date-picker
v-model="formCount.cp5endTime"
type="datetime"
size="small"
@change="cp5getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
@ -446,17 +480,32 @@
<el-col :md="4" :xs="24">
<el-form-item label="KEEN号" />
</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 prop="kennCode">
<el-input v-model="formCount.kennCode" />
<el-input
type="textarea"
v-model="formCount.kennCode"
style="width: 450px"
placeholder="请输入内容"
@paste.native="pasteExcelToKennCode"
/>
</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: -95px">
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="chassisNumber">
<el-input v-model="formCount.chassisNumber" />
<el-input
v-model="formCount.chassisNumber"
style="width: 450px"
type="textarea"
placeholder="请输入内容"
@paste.native="pasteExcelTochassisNumber"
/>
</el-form-item>
</el-col>
</el-row>
@ -467,17 +516,31 @@
</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-input
v-model="formCount.materialCode"
style="width: 450px"
type="textarea"
placeholder="请输入内容"
@paste.native="pasteExcelTomaterialCode"
/>
</el-form-item>
</el-col>
<!-- <el-col :md="4" :xs="24">
</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: -95px">
<el-form-item prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" />
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="sapCode">
<el-input
v-model="formCount.sapCode"
style="width: 450px"
type="textarea"
placeholder="请输入内容"
@paste.native="pasteExcelTosapCode"
/>
</el-form-item>
</el-col> -->
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -499,12 +562,6 @@ import permission from "@/directive/permission/index.js";
import { downloadFile } from "@/utils/crmindex.js";
import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment";
const cityOptions = [
{ id: 0, name: "未结" },
{ id: 1, name: "部分结算" },
{ id: 2, name: "已结" },
/* { id: 3, name: "预批量" }, */
];
export default {
name: "InvoiceSettledDetailDiff",
@ -546,8 +603,6 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime();
},
},
// startTime: "",
// endTime: "",
pickerOptionsCp7: {
disabledDate: (time) => {
let now = new Date();
@ -563,7 +618,6 @@ export default {
},
datetime5: [],
checkedCities: [0],
cities: cityOptions,
selectValue: "",
selectNameValue: "",
radio: "0", //0 1
@ -572,7 +626,7 @@ export default {
//
openView: false,
versionValue: "",
materialGroupValue: "",
materialGroupValue: [],
formTitle: "",
timer: null, //
//
@ -600,6 +654,8 @@ export default {
formCount: {
startTime: "",
endTime: "",
cp5startTime: "",
cp5endTime: "",
// name: "",
// settledate: "",
// materialCode: "",
@ -608,6 +664,11 @@ export default {
// kennCode: "",
// version: "",
},
dataKenCode: "",
datachassisNumber: "",
datamaterialCode: "",
datasapCode: "",
getmaterialGroupValue: "",
list: null,
totalCount: 0,
listLoading: true,
@ -622,6 +683,7 @@ export default {
listExportQuery: {
version: "",
materialCode: undefined,
sapCode: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
@ -718,6 +780,81 @@ export default {
},
},
methods: {
valueChange(data) {
this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ",";
this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
0,
this.getmaterialGroupValue.length - 1
);
},
//excel
pasteExcelToKennCode(e) {
let source = e.clipboardData.getData("Text");
//
let rows = source.split("\r\n"); //
this.dataKenCode = "";
for (let i = 0; i < rows.length; i++) {
if (rows[i] != "") {
//
let columns = rows[i].split("\t"); //
for (let j = 0; j < columns.length; j++) {
this.dataKenCode += columns[j] + ",";
}
}
}
//alert(this.dataKenCode.trimEnd(","));
},
pasteExcelTochassisNumber(e) {
let source = e.clipboardData.getData("Text");
//
let rows = source.split("\r\n"); //
this.datachassisNumber = "";
for (let i = 0; i < rows.length; i++) {
if (rows[i] != "") {
//
let columns = rows[i].split("\t"); //
for (let j = 0; j < columns.length; j++) {
this.datachassisNumber += columns[j] + ",";
}
}
}
},
pasteExcelTomaterialCode(e) {
let source = e.clipboardData.getData("Text");
//
let rows = source.split("\r\n"); //
this.datamaterialCode = "";
for (let i = 0; i < rows.length; i++) {
if (rows[i] != "") {
//
let columns = rows[i].split("\t"); //
for (let j = 0; j < columns.length; j++) {
this.datamaterialCode += columns[j] + ",";
}
}
}
},
pasteExcelTosapCode(e) {
let source = e.clipboardData.getData("Text");
//
let rows = source.split("\r\n"); //
this.datasapCode = "";
for (let i = 0; i < rows.length; i++) {
if (rows[i] != "") {
//
let columns = rows[i].split("\t"); //
for (let j = 0; j < columns.length; j++) {
this.datasapCode += columns[j] + ",";
}
}
}
},
getdateValue(val) {
this.startTime = val;
this.getbalanceIndexData();
@ -727,6 +864,14 @@ export default {
this.getbalanceIndexData();
},
cp5getdateValue(val) {
this.cp5startTime = val;
this.getbalanceIndexData();
},
cp5getdateValue(val) {
this.cp5startTime = val;
this.getbalanceIndexData();
},
getCurrentMonthFirst() {
var date = new Date();
date.setDate(1);
@ -777,7 +922,7 @@ export default {
response.items.forEach((element) => {
let options = {};
options.value = element.description;
options.label = element.description;
options.label = element.description + "/" + element.value;
this.materialGroupList.push(options);
});
})
@ -791,6 +936,8 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.cp5startTime = "";
this.cp5endTime = "";
},
save() {
this.$refs.formCount.validate((valid) => {
@ -798,65 +945,80 @@ export default {
this.formLoading = true;
this.listExportQuery.version = this.formCount.versionValue; //
if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = this.formCount.materialCode; //
var getmaterialCode = this.datamaterialCode.substring(
0,
this.datamaterialCode.length - 1
);
this.listExportQuery.materialCode = getmaterialCode; //
}
// if (this.formCount.sapMaterialCode != "") {
// this.listExportQuery.sapMaterialCode =
// this.formCount.sapMaterialCode; //
// }
if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN
if (this.formCount.sapCode != "") {
var getsapCode = this.datasapCode.substring(
0,
this.datasapCode.length - 1
);
this.listExportQuery.sapCode = getsapCode; //
}
var getdate5 = JSON.stringify(this.datetime5);
if (getdate5 != "[]") {
this.listExportQuery.begin = this.datetime5
? this.datetime5[0] || undefined
: undefined;
this.listExportQuery.end = this.datetime5
? this.datetime5[1] || undefined
: undefined;
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
if (this.formCount.kennCode != "") {
var getgroupValue = this.dataKenCode.substring(
0,
this.dataKenCode.length - 1
);
this.listExportQuery.kenncode = getgroupValue; //KEEN
}
this.listExportQuery.begin = this.cp5startTime
? this.cp5startTime
: undefined;
this.listExportQuery.end = this.cp5endTime
? this.cp5endTime
: undefined;
this.listExportQuery.cp7begin = this.startTime
? this.startTime
: undefined;
this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
var getchassisNumber = this.datachassisNumber.substring(
0,
this.datachassisNumber.length - 1
);
this.listExportQuery.chassisNumber = getchassisNumber; //
}
// if (this.formCount.materialGroupValue != "") {
// this.listExportQuery.materialGroup =
// '"'+this.formCount.materialGroupValue+'"'; //
// }
if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup =
this.formCount.materialGroupValue; //
this.listExportQuery.materialGroup = this.getmaterialGroupValue; //
}
console.log(
"大众发票与结算核对明细表-导出条件:" +
JSON.stringify(this.listExportQuery)
);
this.$axios
.gets(
"/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
this.listExportQuery
)
.then((res) => {
let taskid = res;
if (Number.isInteger(taskid)) {
this.$notify({
title: "成功",
message: "任务生成成功!任务号:" + taskid,
type: "success",
duration: 2000,
});
}
this.getList();
this.formLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.formLoading = false;
this.dialogFormVisible = false;
});
this.formLoading = false;
this.dialogFormVisible = false;
// this.$axios
// .gets(
// "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
// this.listExportQuery
// )
// .then((res) => {
// let taskid = res;
// if (Number.isInteger(taskid)) {
// this.$notify({
// title: "",
// message: ":" + taskid,
// type: "success",
// duration: 2000,
// });
// }
// this.getList();
// this.formLoading = false;
// this.dialogFormVisible = false;
// })
// .catch(() => {
// this.formLoading = false;
// this.dialogFormVisible = false;
// });
}
});
},
@ -870,6 +1032,8 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.cp5startTime = "";
this.cp5endTime = "";
this.dialogFormVisible = true;
},

43
vue/src/views/ux/billManage/IssuedUnsettled/index.vue

@ -1,4 +1,4 @@
<!--发出未结算页-->
<!--发出未结算明细-->
<template>
<div class="cr-body-content">
<!--功能栏-->
@ -408,39 +408,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP7时间:" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="startTime">
<el-date-picker
v-model="formCount.startTime"
type="datetime"
size="small"
:picker-options="pickerOptions0"
@change="getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
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 prop="endTime">
<el-date-picker
v-model="formCount.endTime"
type="datetime"
:picker-options="pickerOptions1"
size="small"
@change="getdateVal"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
@ -622,8 +589,6 @@ export default {
listExportQuery: {
version: "",
materialCode: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
@ -819,10 +784,6 @@ export default {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
this.listExportQuery.cp7begin = this.startTime
? this.startTime
: undefined;
this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
}
@ -986,7 +947,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "大众发票与结算核对明细表";
this.listQuery.name = "大众准时化未结明细表";
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {

125
vue/src/views/ux/billManage/UnSettleDiffExport/index.vue

@ -1,5 +1,5 @@
<!--准时化未结差异比对-->
<!--发出未结算页-->
<template>
<div class="cr-body-content">
<!--功能栏-->
@ -34,7 +34,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔30秒进行自动刷新</span
>说明每间隔15秒进行自动刷新</span
>
</flexbox>
</div>
@ -364,7 +364,7 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="物料组(车型)" />
</el-col>
@ -387,7 +387,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row> -->
</el-row>
<el-row>
<el-col :md="4" :xs="24">
@ -409,46 +409,13 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP7时间:" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-date-picker
v-model="startTime"
type="datetime"
size="small"
:picker-options="pickerOptions0"
@change="getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
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="endTime"
type="datetime"
:picker-options="pickerOptions1"
size="small"
@change="getdateVal"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="KEEN号" />
</el-col>
<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-form-item>
</el-col>
@ -456,29 +423,29 @@
<el-form-item label="底盘号" />
</el-col>
<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-form-item>
</el-col>
</el-row>-->
</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-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 :md="4" :xs="24">
<el-form-item label="厂内零件号" />
</el-col>
<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-form-item>
</el-col>
</el-col> -->
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -547,8 +514,8 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime();
},
},
startTime: "",
endTime: "",
// startTime: "",
// endTime: "",
pickerOptionsCp7: {
disabledDate: (time) => {
let now = new Date();
@ -563,7 +530,6 @@ export default {
},
},
datetime5: [],
datetime7: [],
checkedCities: [0],
cities: cityOptions,
selectValue: "",
@ -600,15 +566,15 @@ export default {
searchContent: "", //
form: {},
formCount: {
name: "未结算对比",
// datetime5: [],
// datetime7: [],
settledate: "",
materialCode: "",
sapMaterialCode: "",
chassisNumber: "",
kennCode: "",
version: "",
startTime: "",
endTime: "",
// name: "",
// settledate: "",
// materialCode: "",
// sapMaterialCode: "",
// chassisNumber: "",
// kennCode: "",
// version: "",
},
list: null,
totalCount: 0,
@ -624,8 +590,6 @@ export default {
listExportQuery: {
version: "",
materialCode: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
@ -663,7 +627,7 @@ export default {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
}, 1000 * 30); //30
}, 1000 * 15); //15
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
clearInterval(timer);
@ -793,7 +757,6 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
// this.datetime7 = [];
},
save() {
this.$refs.formCount.validate((valid) => {
@ -803,38 +766,35 @@ 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.sapMaterialCode != "") {
// this.listExportQuery.sapMaterialCode =
// this.formCount.sapMaterialCode; //
// }
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;
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
// if (this.startTime != "") {
// this.listExportQuery.cp7begin = this.startTime; //CP7
// }
// if (this.endTime != "") {
// this.listExportQuery.cp7end = this.endTime; //CP7
// }
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
}
// if (this.formCount.materialGroupValue != "") {
// this.listExportQuery.materialGroup =
// this.formCount.materialGroupValue; //
// }
if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup =
this.formCount.materialGroupValue; //
}
console.log(
"准时化未结差异比对-导出条件:" +
"大众准时化未结差异比结-导出条件:" +
JSON.stringify(this.listExportQuery)
);
this.$axios
@ -870,8 +830,12 @@ export default {
this.formTitle = "报表统计";
this.isEdit = false;
this.form = {};
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.dialogFormVisible = true;
},
filterHandler(value, row, column) {
const property = column["property"];
return row[property] === value;
@ -984,7 +948,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "大众发票与结算核对明细表";
this.listQuery.name = "大众准时化未结差异比对表";
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {
@ -1048,3 +1012,4 @@ export default {
box-shadow: none !important;
}
</style>

121
vue/src/views/ux/billManage/UnSettledDiff/index.vue

@ -1,4 +1,4 @@
<!--大众准时化未结比对-->
<!--发出未结算比对页-->
<template>
<div class="cr-body-content">
<!--功能栏-->
@ -33,7 +33,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔30秒进行自动刷新</span
>说明每间隔15秒进行自动刷新</span
>
</flexbox>
</div>
@ -363,7 +363,7 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="物料组(车型)" />
</el-col>
@ -386,7 +386,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row> -->
</el-row>
<el-row>
<el-col :md="4" :xs="24">
@ -408,46 +408,13 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :md="4" :xs="24">
<el-form-item label="CP7时间:" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-date-picker
v-model="startTime"
type="datetime"
size="small"
:picker-options="pickerOptions0"
@change="getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
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="endTime"
type="datetime"
:picker-options="pickerOptions1"
size="small"
@change="getdateVal"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="KEEN号" />
</el-col>
<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-form-item>
</el-col>
@ -455,26 +422,26 @@
<el-form-item label="底盘号" />
</el-col>
<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-form-item>
</el-col>
</el-row> -->
</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-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>
<el-form-item prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" />
</el-form-item>
</el-col> -->
@ -499,10 +466,15 @@ import permission from "@/directive/permission/index.js";
import { downloadFile } from "@/utils/crmindex.js";
import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment";
const cityOptions = [
{ id: 0, name: "未结" },
{ id: 1, name: "部分结算" },
{ id: 2, name: "已结" },
/* { id: 3, name: "预批量" }, */
];
export default {
name: "InvoiceSettledDetailDiff",
name: "UnSettledDiff",
components: { Pagination, CRMTableHead },
directives: { permission },
@ -541,8 +513,8 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime();
},
},
startTime: "",
endTime: "",
// startTime: "",
// endTime: "",
pickerOptionsCp7: {
disabledDate: (time) => {
let now = new Date();
@ -557,8 +529,8 @@ export default {
},
},
datetime5: [],
datetime7: [],
checkedCities: [0],
cities: cityOptions,
selectValue: "",
selectNameValue: "",
radio: "0", //0 1
@ -593,15 +565,15 @@ export default {
searchContent: "", //
form: {},
formCount: {
name: "未结算对比",
// datetime5: [],
// datetime7: [],
settledate: "",
materialCode: "",
sapMaterialCode: "",
chassisNumber: "",
kennCode: "",
version: "",
startTime: "",
endTime: "",
// name: "",
// settledate: "",
// materialCode: "",
// sapMaterialCode: "",
// chassisNumber: "",
// kennCode: "",
// version: "",
},
list: null,
totalCount: 0,
@ -617,8 +589,6 @@ export default {
listExportQuery: {
version: "",
materialCode: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
@ -656,7 +626,7 @@ export default {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
}, 1000 * 30); //30
}, 1000 * 15); //15
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
clearInterval(timer);
@ -786,7 +756,6 @@ export default {
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
// this.datetime7 = [];
},
save() {
this.$refs.formCount.validate((valid) => {
@ -796,27 +765,24 @@ 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.sapMaterialCode != "") {
// this.listExportQuery.sapMaterialCode =
// this.formCount.sapMaterialCode; //
// }
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;
}
if (this.startTime != "") {
this.listExportQuery.cp7begin = this.startTime; //CP7
}
if (this.endTime != "") {
this.listExportQuery.cp7end = this.endTime; //CP5
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
@ -825,13 +791,14 @@ export default {
this.listExportQuery.materialGroup =
this.formCount.materialGroupValue; //
}
console.log(
"大众发票与结算核对明细表-导出条件:" +
"大众准时化未结比对-导出条件:" +
JSON.stringify(this.listExportQuery)
);
this.$axios
.gets(
"/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
"/api/settleaccount/ReportMakeService/UnSettledDiff-Make",
this.listExportQuery
)
.then((res) => {
@ -862,8 +829,12 @@ export default {
this.formTitle = "报表统计";
this.isEdit = false;
this.form = {};
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
this.dialogFormVisible = true;
},
filterHandler(value, row, column) {
const property = column["property"];
return row[property] === value;
@ -976,7 +947,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "大众准时化未结明细表";
this.listQuery.name = "未结算对比";
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {

641
vue/src/views/ux/vw/dataInput/hq_h/index.vue

@ -0,0 +1,641 @@
<!--红旗导入功能-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">
<XhJSSelect
:options="versionList"
style="width: 200px"
class="search-container"
@value-change="selectValue"
></XhJSSelect>
<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="primary"
icon="el-icon-download"
@click="handleDownload()"
>导出Excel
</el-button> -->
<el-dropdown
size="small"
class="filter-item"
style="margin-left: 15px; font-weight: bold"
@command="handleCommand"
>
<span class="el-dropdown-link">
导出数据<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="excel" icon="el-icon-plus"
>导出Excel</el-dropdown-item
>
<el-dropdown-item command="csv" icon="el-icon-circle-plus"
>导出Csv</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
<el-input
v-model="searchContent"
clearable
size="small"
placeholder="按照采购订单号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
/>
<el-button
size="mini"
type="success"
icon="el-icon-search"
@click="handleFilter"
>搜索
</el-button>
<!--表格头组件filter查询-->
<c-r-m-table-head
ref="crmTableHead"
:crm-type="crmType"
@handle="handleHandle"
@filter="handleFilters"
>
</c-r-m-table-head>
</flexbox>
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading.fullscreen.lock="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<el-table-column
label="版本"
prop="version"
sortable="custom"
align="center"
width="100px"
fixed
>
<template slot-scope="scope">
<el-tooltip :content="scope.row.version" placement="top">
<span class="link-type">{{ scope.row.version }}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import importExcel from "@/components/ImportExcel-base";
import CRMTableHead from "../../../components/CRMTableHead";
import moment from "moment";
import Lockr from "lockr";
import { downloadFile } from "@/utils/crmindex.js";
import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
export default {
name: "SparePart",
components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "sparePart",
versionValue: "",
versionList: [], //
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
searchContent: "", //
customerInfo: {
settleAccountId: "",
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: true,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listVersionQuery: {
SkipCount: 0,
MaxResultCount: 15,
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
//OrgID:"",
SkipCount: 0,
MaxResultCount: 15,
version: "",
site: "TH",
userId: "00000000-0000-0000-0000-000000000000",
},
listExportQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
//OrgID:"",
SkipCount: 0,
MaxResultCount: 15,
version: "",
fileType: 0,
userId: "",
},
page: 1,
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 260,
isEdit: false,
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 260;
};
},
created() {
this.getVersionInfo();
if (this.versionList == []) {
this.getList();
}
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
tempsTabs.push({
label: "采购订单号",
prop: "purchaseOrderNo",
width: 220,
});
tempsTabs.push({
label: "采购订单行项目",
prop: "purchaseOrderNoItem",
width: 170,
});
tempsTabs.push({
label: "采购订单文本",
prop: "purchaseOrderNoText",
width: 170,
});
tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
tempsTabs.push({
label: "采购价格不含税",
prop: "purchasePriceNoTax",
width: 200,
});
tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
tempsTabs.push({
label: "日期",
prop: "spareDate",
width: 150,
formType: "datetime",
});
tempsTabs.push({
label: "交货单号",
prop: "deliveryOrderNo",
width: 150,
});
tempsTabs.push({
label: "交货行号",
prop: "deliveryLineNum",
width: 150,
});
tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
tempsTabs.push({
label: "德国发票号",
prop: "germanInvoiceNo",
width: 150,
});
tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
return tempsTabs;
},
},
methods: {
handleCommand(command) {
if (this.versionValue === "") {
this.$message.error("请先选择版本!");
return;
}
switch (command) {
case "excel":
this.listQuery.fileType = 1; //0csv,1excel
break;
case "csv":
this.listQuery.fileType = 0; //0csv,1excel
break;
default:
//
break;
}
this.listLoading = true;
if (this.versionValue === "") {
this.$message.error("必需选择版本!");
this.listLoading = false;
return;
}
if (this.versionValue != "") {
this.listQuery.version = this.versionValue;
}
console.log("大众看板导出:" + JSON.stringify(this.listQuery));
this.$axios
.posts("/api/settleaccount/SparePart/Export", this.listQuery)
.then((res) => {
let fileNameOfProject = res;
this.$axios
.BolbGets(
"/api/settleaccount/getblobfile/download/" + fileNameOfProject
)
.then((response) => {
if (fileNameOfProject.indexOf("_") != -1) {
let downName =
fileNameOfProject.slice(
0,
fileNameOfProject.lastIndexOf("_")
) +
fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, fileNameOfProject);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
},
// //
// async handleDownload() {
// this.listLoading = true;
// if (this.versionValue === "") {
// this.$message.error("");
// this.listLoading = false;
// return;
// }
// if (this.versionValue != "") {
// this.listQuery.version = this.versionValue;
// }
// console.log("" + JSON.stringify(this.listQuery));
// this.$axios
// .posts("/api/settleaccount/SparePart/Export", this.listQuery)
// .then((res) => {
// let fileNameOfProject = res;
// this.$axios
// .BolbGets(
// "/api/settleaccount/getblobfile/download/" + fileNameOfProject
// )
// .then((response) => {
// if (fileNameOfProject.indexOf("_") != -1) {
// let downName =
// fileNameOfProject.slice(
// 0,
// fileNameOfProject.lastIndexOf("_")
// ) +
// fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
// downloadFile(response, downName);
// this.$notify({
// title: "",
// message: "-",
// type: "success",
// duration: 2000,
// });
// } else {
// downloadFile(response, fileNameOfProject);
// this.$notify({
// title: "",
// message: "-",
// type: "success",
// duration: 2000,
// });
// }
// this.listLoading = false;
// });
// });
// },
selectValue(params) {
//
this.versionValue = params.value;
this.getList();
},
selectOptionsChange(item) {
this.getList();
},
getVersionInfo() {
//
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/SparePart/listVersion", this.listQuery)
.then((response) => {
this.versionList = [];
response.items.forEach((element) => {
let options = {};
options.value = element.id;
options.label = element.version;
this.versionList.push(options);
});
if (JSON.stringify(this.versionList) != "[]") {
//
this.versionValue = this.versionList[0].label;
this.getList();
}
this.listLoading = false;
})
.catch(() => {
this.listLoading = false;
});
},
handleImportExcel() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
// if (column.property === "state") {
// return { 0: "", 2: "" }[row[column.property]];
// }
if (
column.property == "settleInputDate" ||
column.property == "settleDate"
) {
var date = row[column.property];
if (date == undefined) {
return "";
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
return row[column.property] || "--";
},
importExcelData() {
this.getVersionInfo();
this.listLoading = false;
//
this.showExcelImport = false;
},
getList() {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
if (this.versionValue != "") {
this.listQuery.version = this.versionValue;
}
console.log("列表查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts("/api/settleaccount/SparePart/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
fetchData(id) {
//
this.$axios
.gets("/api/settleaccount/SparePart/" + id)
.then((response) => {
this.form = response;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "purchaseOrderNo";
let filter = {
logic: 0,
column: column,
action: 0,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
/** 多项筛选操作 */
/** 筛选操作 */
handleFilters(data) {
if (data === null) {
this.listQuery.Filters = [];
this.getList(); //
} else {
this.filterObj = data;
console.log("筛选" + JSON.stringify(data));
var offsetHei = document.documentElement.clientHeight;
var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
this.tableHeight = offsetHei - removeHeight;
this.currentPage = 1;
let Filter = [];
data.forEach((item) => {
let filter = {};
if (item.formType === "datetime" || item.formType === "datetime") {
// (datetime >= a and datetime <=b)
filter["Column"] = item.fieldName;
filter["Logic"] = 0;
filter["Value"] = item.value[0];
filter["Action"] = item.action;
Filter.push(filter);
if (item.value[1] != null) {
filter["Value"] = item.value[1];
filter["Action"] = 5;
Filter.push(filter);
}
} else {
filter["Column"] = item.fieldName;
filter["Value"] = item.value;
filter["Logic"] = 0;
filter["Action"] = item.action;
Filter.push(filter);
}
});
console.log("筛选条件" + JSON.stringify(Filter));
this.listQuery.Filters = Filter;
this.getList();
}
},
resetQuery() {},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
console.log(this.listQuery.Sorting);
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
// if (column.property === "qty") {
// return { textAlign: "right" };
// } else {
// return { textAlign: "left" };
// }
return { textAlign: "left" };
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "right", background: "#FAFAFA" };
} else {
return { textAlign: "left", background: "#FAFAFA" };
}
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
},
};
</script>
<style lang="scss" scoped>
@import "../../../styles/crmtable.scss";
</style>
<style lang="scss">
.el-table .cell.el-tooltip {
white-space: pre-wrap;
}
</style>
Loading…
Cancel
Save