Administrator 3 years ago
parent
commit
a10abe90d6
  1. 3
      vue/src/router/index.js
  2. 11
      vue/src/router/modules/fisprint.js
  3. 5
      vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
  4. 4
      vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
  5. 36
      vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
  6. 38
      vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
  7. 2
      vue/src/views/pg-fis/basedate/m100Online/detail.vue
  8. 2
      vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
  9. 2
      vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
  10. 12
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  11. 194
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  12. 1
      vue/src/views/pg-fis/basedate/productLine/index.vue
  13. 2
      vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
  14. 2
      vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue
  15. 182
      vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
  16. 69
      vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
  17. 125
      vue/src/views/ux/billManage/IssuedUnsettled/index.vue
  18. 255
      vue/src/views/ux/billManage/SettleDoorPanel/index.vue
  19. 294
      vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue
  20. 130
      vue/src/views/ux/billManage/UnSettleDiffExport/index.vue
  21. 123
      vue/src/views/ux/billManage/UnSettledDiff/index.vue
  22. 272
      vue/src/views/ux/billManage/kanBanWithCode/index.vue
  23. 190
      vue/src/views/ux/billManage/sparePart/index.vue
  24. 9
      vue/static/config.js

3
vue/src/router/index.js

@ -86,7 +86,8 @@ export const constantRoutes = [
children: [ children: [
{ {
path: 'dashboard', path: 'dashboard',
component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis
//component: () => import('@/views/ux/backGroundWork'),
name: 'Dashboard', name: 'Dashboard',
meta: { meta: {
title: '系统首页', title: '系统首页',

11
vue/src/router/modules/fisprint.js

@ -35,17 +35,8 @@ const pgfisPrint = {
//roles: ['SettleAccount.Reports'], //roles: ['SettleAccount.Reports'],
icon: '结算对比' icon: '结算对比'
} }
},
{
path: '/pg-M100Online',
component: () => import('@/views/pg-fis/basedate/m100Online'),
name: 'pg-M100Online',//命名路由
meta: {
title: 'M100上线信息',
//roles: ['SettleAccount.Reports'],
icon: '售后'
}
} }
] ]
} }

5
vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue

@ -126,7 +126,7 @@
type="success" type="success"
icon="el-icon-s-shop" icon="el-icon-s-shop"
@click="handleUpdate()" @click="handleUpdate()"
>重打(只支持单选)</el-button >重打</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -517,7 +517,6 @@ export default {
if (this.customerInfo.productLine != "") { if (this.customerInfo.productLine != "") {
this.listQuery.ProductLine = this.customerInfo.productLine; this.listQuery.ProductLine = this.customerInfo.productLine;
} }
console.log(JSON.stringify(this.listQuery)); console.log(JSON.stringify(this.listQuery));
this.$axios this.$axios
.posts( .posts(
@ -777,7 +776,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

4
vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue

@ -99,7 +99,7 @@
type="success" type="success"
icon="el-icon-s-shop" icon="el-icon-s-shop"
@click="handleUpdate()" @click="handleUpdate()"
>重打(只支持单选)</el-button >重打</el-button
> >
</el-form-item> </el-form-item>
@ -678,7 +678,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

36
vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue

@ -47,7 +47,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form-item> </el-form-item>
<!-- <el-form-item label="底盘号码"> <!-- <el-form-item label="底盘号码">
@ -565,6 +564,7 @@ export default {
// //
var params = []; var params = [];
let myalert = ""; //使 let myalert = ""; //使
let myalertcount = [];
if (row) { if (row) {
// //
params.push(row.id); params.push(row.id);
@ -577,11 +577,36 @@ export default {
}); });
myalert = "选中项"; myalert = "选中项";
} }
this.$confirm("是否作废" + myalert + "?", "提示", { console.log("作废查询参数:" + JSON.stringify(params));
this.$axios
.posts("/api/newjit/MenBanPackingList/get-all-del-List", params)
.then((response) => {
//alert(response.status);
const index = this.list.indexOf(row);
if (response.status === false) {
this.$message({
message: response.message,
type: "error",
});
return;
} else {
this.fileQuery.dataname = JSON.stringify(response);
response.forEach((itemsss) => {
myalertcount.push(itemsss.billNum);
});
console.log(
"门板-调用Handlers/Handler1.ashx?report=menban传的值:" +
JSON.stringify(this.fileQuery.dataname)
);
this.$confirm(
"是否作废选中的" + response.length + "条记录?",
"提示",
{
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) }
)
.then(() => { .then(() => {
this.$axios this.$axios
.posts("/api/newjit/MenBanPackingList/scrap", params) .posts("/api/newjit/MenBanPackingList/scrap", params)
@ -602,6 +627,9 @@ export default {
message: "已取消操作", message: "已取消操作",
}); });
}); });
}
})
.catch(() => {});
}, },
fetchData(id) { fetchData(id) {
// //
@ -693,7 +721,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

38
vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue

@ -454,7 +454,8 @@ export default {
ifr.setAttribute("name", "printPdf" + date); ifr.setAttribute("name", "printPdf" + date);
ifr.src = window.URL.createObjectURL(blob); ifr.src = window.URL.createObjectURL(blob);
document.body.appendChild(ifr); document.body.appendChild(ifr);
this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src)) this.doPrint("printPdf" + date);
alert("ifr.src:" + JSON.stringify(ifr.src));
window.URL.revokeObjectURL(ifr.src); // URL window.URL.revokeObjectURL(ifr.src); // URL
this.dialogFormVisible = false; this.dialogFormVisible = false;
}, },
@ -581,6 +582,7 @@ export default {
// //
var params = []; var params = [];
let myalert = ""; //使 let myalert = ""; //使
let myalertcount = [];
if (row) { if (row) {
// //
params.push(row.id); params.push(row.id);
@ -593,11 +595,36 @@ export default {
}); });
myalert = "选中项"; myalert = "选中项";
} }
this.$confirm("是否作废" + myalert + "?", "提示", { console.log("作废查询参数:" + JSON.stringify(params));
this.$axios
.posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params)
.then((response) => {
//alert(response.status);
const index = this.list.indexOf(row);
if (response.status === false) {
this.$message({
message: response.message,
type: "error",
});
return;
} else {
this.fileQuery.dataname = JSON.stringify(response);
response.forEach((itemsss) => {
myalertcount.push(itemsss.billNum);
});
console.log(
"门板-调用Handlers/Handler1.ashx?report=menban传的值:" +
JSON.stringify(this.fileQuery.dataname)
);
this.$confirm(
"是否作废选中的" + response.length + "条记录?",
"提示",
{
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) }
)
.then(() => { .then(() => {
this.$axios this.$axios
.posts("/api/newjit/ZhuHuBanPackingList/scrap", params) .posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
@ -618,6 +645,9 @@ export default {
message: "已取消操作", message: "已取消操作",
}); });
}); });
}
})
.catch(() => {});
}, },
fetchData(id) { fetchData(id) {
// //
@ -709,7 +739,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

2
vue/src/views/pg-fis/basedate/m100Online/detail.vue

@ -340,7 +340,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },
}, },

2
vue/src/views/pg-fis/basedate/m100Online/detailMB.vue

@ -735,7 +735,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

2
vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue

@ -716,7 +716,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },

12
vue/src/views/pg-fis/basedate/m100Online/index.vue

@ -701,6 +701,12 @@ export default {
width: 120, width: 120,
}); });
tempsTabs.push({
label: "柱护板状态",
prop: "billStatus",
width: 120,
});
tempsTabs.push({ tempsTabs.push({
label: "备注", label: "备注",
prop: "remark", prop: "remark",
@ -867,7 +873,11 @@ export default {
if (this.listQuery.state == 1) { if (this.listQuery.state == 1) {
this.listQuery.billStatus = this.listQuery.state[0]; this.listQuery.billStatus = this.listQuery.state[0];
} }
if (this.listQuery.productType === 2) {
this.listQuery.ZHBBillStatus = 2;
} else {
this.listQuery.ZHBBillStatus = 0;
}
this.$axios this.$axios
.gets("/api/newjit/bill-m100/list", this.listQuery) .gets("/api/newjit/bill-m100/list", this.listQuery)
.then((response) => { .then((response) => {

194
vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

@ -330,6 +330,7 @@
<el-button <el-button
v-loading="formLoading" v-loading="formLoading"
type="primary" type="primary"
:disabled="isDisable"
@click="save" @click="save"
v-debounce="debounceClick" v-debounce="debounceClick"
>确认</el-button >确认</el-button
@ -421,6 +422,7 @@ export default {
}; };
return { return {
crmType: "M100Online", crmType: "M100Online",
isDisable: false,
drawerMBPrint: false, drawerMBPrint: false,
drawerMBDelete: false, drawerMBDelete: false,
drawerZHBPrint: false, drawerZHBPrint: false,
@ -437,7 +439,7 @@ export default {
], ],
}, },
billState: [ billState: [
{ id: 2, name: "已匹配" }, { id: 2, name: "未打印" },
{ id: 3, name: "已打印" }, { id: 3, name: "已打印" },
], ],
valueSelect: "", valueSelect: "",
@ -453,7 +455,7 @@ export default {
drawer: false, drawer: false,
list: null, list: null,
totalCount: 0, totalCount: 0,
listLoading: true, listLoading: false,
listLoaddingPrint: true, listLoaddingPrint: true,
customerInfo: { customerInfo: {
bomId: "", bomId: "",
@ -494,6 +496,7 @@ export default {
ProductLine: undefined, ProductLine: undefined,
BillStatus: undefined, BillStatus: undefined,
CanNotPrint: false, CanNotPrint: false,
ZHBBillStatus: undefined,
}, },
listExportQuery: { listExportQuery: {
erpAssemblyCode: undefined, erpAssemblyCode: undefined,
@ -631,6 +634,12 @@ export default {
width: 120, width: 120,
}); });
tempsTabs.push({
label: "柱护板状态",
prop: "printbillnum",
width: 120,
});
tempsTabs.push({ tempsTabs.push({
label: "备注", label: "备注",
prop: "remark", prop: "remark",
@ -876,7 +885,7 @@ export default {
/** 格式化字段 */ /** 格式化字段 */
fieldFormatter(row, column) { fieldFormatter(row, column) {
if (column.property === "billStatus") { if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]]; return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
} }
if (column.property == "onlineTime" || column.property == "receiveTime") { if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property]; var date = row[column.property];
@ -897,6 +906,16 @@ export default {
} else { } else {
this.listQueryList.SkipCount = (this.page - 1) * 15; this.listQueryList.SkipCount = (this.page - 1) * 15;
} }
if (this.listQuery.productType === 2) {
this.listQueryList.ZHBBillStatus = 2;
} else {
this.listQueryList.ZHBBillStatus = 0;
}
if (this.listQuery.productType === 2) {
this.listQuery.ZHBBillStatus = 2;
} else {
this.listQuery.ZHBBillStatus = 0;
}
this.listQueryList.BillStatus = 2; // this.listQueryList.BillStatus = 2; //
this.listQueryList.ProductLine = this.listQuery.productLine; //线 this.listQueryList.ProductLine = this.listQuery.productLine; //线
this.listQueryList.CanNotPrint = false; // this.listQueryList.CanNotPrint = false; //
@ -1003,7 +1022,7 @@ export default {
} }
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },
@ -1068,6 +1087,7 @@ export default {
// //
this.hostSNQuery.isZhuHuBan = "1"; this.hostSNQuery.isZhuHuBan = "1";
console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery)); console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
this.$axios this.$axios
.gets( .gets(
"/api/newjit/bill-m100/get-print-start-hostsn2", "/api/newjit/bill-m100/get-print-start-hostsn2",
@ -1261,7 +1281,11 @@ export default {
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
this.hostCheckQuery.productLine = this.listQuery.productLine; this.hostCheckQuery.productLine = this.listQuery.productLine;
this.isDisable = true;
console.log(
"检查柱护板-hostCheckQuery" +
JSON.stringify(this.hostCheckQuery)
);
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/check-mb-hostsn-break-num", "/api/newjit/bill-m100/check-mb-hostsn-break-num",
@ -1269,6 +1293,10 @@ export default {
) )
.then((response) => { .then((response) => {
console.log("检查门板-大众顺序号是否断号"); console.log("检查门板-大众顺序号是否断号");
// this.isDisable = true;
// setTimeout(() => {
// this.isDisable = false;
// }, 1000);
if (response.item.length > 0) { if (response.item.length > 0) {
// //
this.$confirm( this.$confirm(
@ -1316,15 +1344,17 @@ export default {
console.log("获取文件base64编码"); console.log("获取文件base64编码");
console.log(response); console.log(response);
this.formLoading = false; this.formLoading = false;
this.isDisable = false;
this.printpdf(response); // this.printpdf(response); //
}) })
.catch((error) => { .catch((error) => {
this.formLoading = false; this.formLoading = false;
this.isDisable = false;
}); });
} }
}); });
}) })
.catch(() => {}); .catch(() => { this.isDisable = false;});
} else { } else {
// //
// //
@ -1361,10 +1391,12 @@ export default {
console.log("获取文件base64编码"); console.log("获取文件base64编码");
console.log(response); console.log(response);
this.formLoading = false; this.formLoading = false;
this.isDisable = false;
this.printpdf(response); // this.printpdf(response); //
}) })
.catch((error) => { .catch((error) => {
this.formLoading = false; this.formLoading = false;
this.isDisable = false;
}); });
} }
}) })
@ -1373,23 +1405,28 @@ export default {
message: response.message, message: response.message,
type: "error", type: "error",
}); });
this.isDisable = false;
return; return;
}); });
} }
}); });
} else if (this.listQuery.productType === 2) { } else if (this.listQuery.productType === 2) {
// //
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
this.hostCheckQuery.productLine = this.listQuery.productLine; this.hostCheckQuery.productLine = this.listQuery.productLine;
this.isDisable = true;
this.$axios this.$axios
.posts( .posts(
"/api/newjit/bill-m100/check-zhb-hostsn-break-num", "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
this.hostCheckQuery this.hostCheckQuery
) )
.then((response) => { .then((response) => {
console.log("检查柱护板-大众顺序号是否断号"); console.log("检查门板-大众顺序号是否断号");
// this.isDisable = true;
// setTimeout(() => {
// this.isDisable = false;
// }, 1000);
if (response.item.length > 0) { if (response.item.length > 0) {
// //
this.$confirm( this.$confirm(
@ -1436,14 +1473,20 @@ export default {
.then((response) => { .then((response) => {
console.log("获取文件base64编码"); console.log("获取文件base64编码");
console.log(response); console.log(response);
this.formLoading = false;
this.isDisable = false;
this.printpdf(response); // this.printpdf(response); //
})
.catch((error) => {
this.formLoading = false;
this.isDisable = false;
}); });
} }
}); });
}) })
.catch(() => {}); .catch(() => {this.isDisable = false;});
} // } else {
else { //
// //
// //
this.$axios this.$axios
@ -1477,7 +1520,13 @@ export default {
.then((response) => { .then((response) => {
console.log("获取文件base64编码"); console.log("获取文件base64编码");
console.log(response); console.log(response);
this.formLoading = false;
this.isDisable = false
this.printpdf(response); // this.printpdf(response); //
})
.catch((error) => {
this.formLoading = false;
this.isDisable = false;
}); });
} }
}) })
@ -1486,10 +1535,123 @@ export default {
message: response.message, message: response.message,
type: "error", type: "error",
}); });
this.isDisable = false;
return; return;
}); });
} }
}); });
//
// this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
// this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
// this.hostCheckQuery.productLine = this.listQuery.productLine;
// this.$axios
// .posts(
// "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
// this.hostCheckQuery
// )
// .then((response) => {
// console.log("-");
// if (response.item.length > 0) {
// //
// this.$confirm(
// "?" + response.item,
// "",
// {
// confirmButtonText: "",
// cancelButtonText: "",
// type: "warning",
// }
// )
// .then(() => {
// //
// //
// this.$axios
// .posts(
// "/api/newjit/bill-m100/print-zhuhuban-packing-list",
// this.hostPrintQuery
// )
// .then((response) => {
// console.log("");
// console.log(response);
// console.log(response.status);
// if (response.status === false) {
// this.$message({
// message: response.message,
// type: "error",
// });
// return;
// } else {
// //grid++jsonbase64
// //this.fileQuery.report = "menban";
// this.fileQuery.dataname = JSON.stringify(
// response.item
// );
// //this.fileQuery.dataname = "";
// console.log("json");
// console.log(this.fileQuery.dataname);
// this.$axios
// .posts(
// "/Handlers/Handler1.ashx?report=menban",
// qs.stringify(this.fileQuery)
// )
// .then((response) => {
// console.log("base64");
// console.log(response);
// this.printpdf(response); //
// });
// }
// });
// })
// .catch(() => {});
// } //
// else {
// //
// //
// this.$axios
// .posts(
// "/api/newjit/bill-m100/print-zhuhuban-packing-list",
// this.hostPrintQuery
// )
// .then((response) => {
// console.log("");
// console.log(response);
// if (response.status === false) {
// this.$message({
// message: response.message,
// type: "error",
// });
// return;
// } else {
// //grid++jsonbase64
// //this.fileQuery.report = "menban";
// this.fileQuery.dataname = JSON.stringify(
// response.item
// );
// //this.fileQuery.dataname = "";
// console.log("json");
// console.log(this.fileQuery.dataname);
// this.$axios
// .posts(
// "/Handlers/Handler1.ashx?report=menban",
// qs.stringify(this.fileQuery)
// )
// .then((response) => {
// console.log("base64");
// console.log(response);
// this.printpdf(response); //
// });
// }
// })
// .catch(() => {
// this.$message({
// message: response.message,
// type: "error",
// });
// return;
// });
// }
// });
} }
} else { } else {
/**接口1获取打印数据,接口2获得grid++模板的base64编码 */ /**接口1获取打印数据,接口2获得grid++模板的base64编码 */
@ -1968,7 +2130,9 @@ export default {
}, },
//线 //线
getProductLine() { getProductLine() {
this.listPLQuery.UserId = this.userInfo.userId; this.listPLQuery.UserId = this.userInfo.userId;
console.log("this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId"+this.listPLQuery.UserId);
this.$axios this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery) .gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => { .then((response) => {
@ -2019,6 +2183,11 @@ export default {
this.listQuery.state = []; this.listQuery.state = [];
this.isShowState = false; this.isShowState = false;
} }
if (this.listQuery.productType === 2) {
this.listQueryList.ZHBBillStatus = 2;
} else {
this.listQueryList.ZHBBillStatus = 0;
}
}, },
/*单据状态变更 */ /*单据状态变更 */
checkedListChange(index) { checkedListChange(index) {
@ -2076,6 +2245,7 @@ export default {
this.doPrint("printPdf" + date); this.doPrint("printPdf" + date);
window.URL.revokeObjectURL(ifr.src); // URL window.URL.revokeObjectURL(ifr.src); // URL
this.dialogFormVisible = false; this.dialogFormVisible = false;
this.getList();
}, },
httpPost(URL, PARAMS) { httpPost(URL, PARAMS) {
var temp = document.createElement("form"); var temp = document.createElement("form");

1
vue/src/views/pg-fis/basedate/productLine/index.vue

@ -936,6 +936,7 @@ export default {
"/api/newjit/product-line-authority/do-authority",this.saveQuery "/api/newjit/product-line-authority/do-authority",this.saveQuery
) )
.then((response) => { .then((response) => {
debugger
console.log(response); console.log(response);
this.dialogFormVisible = false; this.dialogFormVisible = false;
this.getList(); this.getList();

2
vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue

@ -252,7 +252,7 @@ export default {
return { textAlign: "left", background: "#FAFAFA" }; return { textAlign: "left", background: "#FAFAFA" };
}, },
handleRowClick(row, column, event) { handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection(); //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
}, },
}, },

2
vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue

@ -940,7 +940,7 @@ export default {
if(this.data2.length !==0) if(this.data2.length !==0)
{ {
this.$message({ this.$message({
message: "还有结算价代码尚未匹配", message: "还有代码尚未匹配",
type: "error", type: "error",
}); });
return; return;

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

@ -19,6 +19,22 @@
@click="handleCreate" @click="handleCreate"
>统计 >统计
</el-button> </el-button>
<el-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>删除(支持批量)</el-button
>
<el-button
class="filter-item"
type="success"
icon="el-icon-check"
size="mini"
@click="handleCreateBills()"
>生成出库单(支持批量)</el-button
>
</flexbox> </flexbox>
</div> </div>
<!-- 刷新 --> <!-- 刷新 -->
@ -60,8 +76,10 @@
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
@row-click="handleRowClick" @row-click="handleRowClick"
@selection-change="handleSelectionChange"
@filter-change="filterChange" @filter-change="filterChange"
> >
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -378,12 +396,12 @@
<el-select <el-select
v-model="formCount.materialGroupValue" v-model="formCount.materialGroupValue"
size="medium" size="medium"
multiple
collapse-tags collapse-tags
multiple
filterable filterable
clearable clearable
style="width: 350px; margin-right: 15px"
@change="valueChange" @change="valueChange"
style="width: 350px; margin-right: 15px"
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option
@ -401,12 +419,13 @@
<el-form-item label="CP5时间:" /> <el-form-item label="CP5时间:" />
</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 prop="cp5startTime"> <el-form-item>
<el-date-picker <el-date-picker
v-model="formCount.cp5startTime" v-model="cp5startTime"
:picker-options="pickerOptions2"
type="datetime" type="datetime"
size="small" size="small"
@change="cp5getdateValue" @change="getdateValueCp5"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
default-time="00:00:00" default-time="00:00:00"
> >
@ -414,12 +433,13 @@
</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 prop="cp5endTime"> <el-form-item>
<el-date-picker <el-date-picker
v-model="formCount.cp5endTime" v-model="cp5endTime"
:picker-options="pickerOptions3"
type="datetime" type="datetime"
size="small" size="small"
@change="cp5getdateValue" @change="getdateValCp5"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59" default-time="23:59:59"
> >
@ -469,7 +489,7 @@
style="color: #37b328" style="color: #37b328"
></i> ></i>
</template> </template>
<el-row> <!-- <el-row>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="KEEN号" /> <el-form-item label="KEEN号" />
</el-col> </el-col>
@ -498,6 +518,23 @@
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
</el-row> -->
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="KEEN号" />
</el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="kennCode">
<el-input
type="textarea"
v-model="formCount.kennCode"
style="width: 450px"
:rows="4"
placeholder="多个KENN号,请以回车换行形式添加!"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -654,6 +691,19 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime(); 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();
},
},
pickerOptionsCp7: { pickerOptionsCp7: {
disabledDate: (time) => { disabledDate: (time) => {
let now = new Date(); let now = new Date();
@ -715,6 +765,8 @@ export default {
// kennCode: "", // kennCode: "",
// version: "", // version: "",
}, },
cp5startTime: "",
cp5endTime: "",
dataKenCode: "", dataKenCode: "",
datachassisNumber: "", datachassisNumber: "",
datamaterialCode: "", datamaterialCode: "",
@ -746,7 +798,7 @@ export default {
listQuery: { listQuery: {
taskId: "", taskId: "",
name: "", name: "",
type:"" type: "",
}, },
page: 1, page: 1,
JobversionValue: "", JobversionValue: "",
@ -839,6 +891,107 @@ export default {
}, },
}, },
methods: { methods: {
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleCreateBills(row){
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/wms/WmsJitOutPut", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
//
handleDelete(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
// //
JobVersionValue(params) { JobVersionValue(params) {
// //
@ -934,12 +1087,13 @@ export default {
this.getbalanceIndexData(); this.getbalanceIndexData();
}, },
cp5getdateValue(val) { //cp5
getdateValueCp5(val) {
this.cp5startTime = val; this.cp5startTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
}, },
cp5getdateValue(val) { getdateValCp5(val) {
this.cp5startTime = val; this.cp5endTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
}, },
getCurrentMonthFirst() { getCurrentMonthFirst() {
@ -1048,8 +1202,6 @@ export default {
"大众发票与结算核对明细表-导出条件:" + "大众发票与结算核对明细表-导出条件:" +
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)
); );
this.formLoading = false;
this.dialogFormVisible = false;
this.$axios this.$axios
.gets( .gets(
"/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make", "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",

69
vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue

@ -19,6 +19,14 @@
@click="handleCreate" @click="handleCreate"
>统计 >统计
</el-button> </el-button>
<el-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>删除(支持批量)</el-button
>
</flexbox> </flexbox>
</div> </div>
<!-- 刷新 --> <!-- 刷新 -->
@ -58,10 +66,12 @@
stripe stripe
border border
highlight-current-row highlight-current-row
@selection-change="handleSelectionChange"
style="width: 100%" style="width: 100%"
@row-click="handleRowClick" @row-click="handleRowClick"
@filter-change="filterChange" @filter-change="filterChange"
> >
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -515,6 +525,7 @@ export default {
], ],
customerInfos: "", customerInfos: "",
searchContent: "", // searchContent: "", //
getmaterialGroupValue: "",
form: {}, form: {},
formCount: { formCount: {
name: "未结算对比", name: "未结算对比",
@ -549,12 +560,12 @@ export default {
materialGroup: undefined, materialGroup: undefined,
begin: undefined, begin: undefined,
end: undefined, end: undefined,
sapCode: undefined sapCode: undefined,
}, },
listQuery: { listQuery: {
taskId: "", taskId: "",
name: "", name: "",
type:"" type: "",
}, },
page: 1, page: 1,
JobversionValue: "", JobversionValue: "",
@ -608,7 +619,7 @@ export default {
/* 主表头 */ /* 主表头 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({ tempsTabs.push({
label: "版本号", label: "版本号",
prop: "type", prop: "type",
width: 85, width: 85,
@ -652,6 +663,58 @@ tempsTabs.push({
}, },
}, },
methods: { methods: {
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleDelete(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
valueChange(data) { valueChange(data) {
this.getmaterialGroupValue = ""; this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ","; this.getmaterialGroupValue += data + ",";

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

@ -19,6 +19,14 @@
@click="handleCreate" @click="handleCreate"
>统计 >统计
</el-button> </el-button>
<el-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>删除(支持批量)</el-button
>
</flexbox> </flexbox>
</div> </div>
<!-- 刷新 --> <!-- 刷新 -->
@ -60,8 +68,10 @@
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
@row-click="handleRowClick" @row-click="handleRowClick"
@selection-change="handleSelectionChange"
@filter-change="filterChange" @filter-change="filterChange"
> >
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -397,7 +407,7 @@
</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="CP5时间:" /> <el-form-item label="CP5时间:" />
</el-col> </el-col>
@ -416,6 +426,40 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </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="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-row> <el-row>
@ -717,6 +761,58 @@ export default {
}, },
}, },
methods: { methods: {
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleDelete(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
// //
JobVersionValue(params) { JobVersionValue(params) {
// //
@ -844,18 +940,23 @@ export default {
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 != "[]") {
this.listExportQuery.begin = this.datetime5 // this.listExportQuery.begin = this.datetime5
? this.datetime5[0] || undefined // ? this.datetime5[0] || undefined
// : undefined;
// this.listExportQuery.end = this.datetime5
// ? this.datetime5[1] || undefined
// : undefined;
// } else {
// this.listExportQuery.begin = undefined;
// this.listExportQuery.end = undefined;
// }
//cp5
this.listExportQuery.begin = this.startTime
? this.startTime
: undefined; : undefined;
this.listExportQuery.end = this.datetime5 this.listExportQuery.end = this.endTime ? this.endTime : undefined;
? this.datetime5[1] || undefined
: undefined;
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
if (this.formCount.chassisNumber != "") { if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; // this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
} }

255
vue/src/views/ux/billManage/SettleDoorPanel/index.vue

@ -5,6 +5,12 @@
<!-- 搜索 --> <!-- 搜索 -->
<div style="float: left"> <div style="float: left">
<flexbox class="content-header"> <flexbox class="content-header">
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
@ -13,6 +19,14 @@
@click="handleCreate" @click="handleCreate"
>统计 >统计
</el-button> </el-button>
<el-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>删除(支持批量)</el-button
>
</flexbox> </flexbox>
</div> </div>
<!-- 刷新 --> <!-- 刷新 -->
@ -54,8 +68,10 @@
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
@row-click="handleRowClick" @row-click="handleRowClick"
@selection-change="handleSelectionChange"
@filter-change="filterChange" @filter-change="filterChange"
> >
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -372,9 +388,12 @@
<el-select <el-select
v-model="formCount.materialGroupValue" v-model="formCount.materialGroupValue"
size="medium" size="medium"
collapse-tags
multiple
filterable filterable
clearable clearable
style="width: 188px; margin-right: 15px" @change="valueChange"
style="width: 350px; margin-right: 15px"
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option
@ -388,7 +407,7 @@
</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="CP5时间:" /> <el-form-item label="CP5时间:" />
</el-col> </el-col>
@ -407,6 +426,39 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </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>
<el-date-picker
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"
>
</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>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
@ -447,16 +499,26 @@
<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"
:rows="5"
type="textarea"
placeholder="多个KEEN号,请以回车换行形式添加!"
/>
</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="chassisNumber">
<el-input v-model="formCount.chassisNumber" /> <el-input
v-model="formCount.chassisNumber"
:rows="5"
type="textarea"
placeholder="多个底盘号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -466,16 +528,26 @@
<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="10" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" /> <el-input
type="textarea"
v-model="formCount.materialCode"
:rows="5"
placeholder="多个客户零件号,请以回车换行形式添加!"
/>
</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"
:rows="5"
type="textarea"
placeholder="多个厂内零件号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -499,21 +571,25 @@ 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";
import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
export default { export default {
name: "SettleDoorPanel", name: "SettleDoorPanel",
components: { Pagination, CRMTableHead }, components: { Pagination, CRMTableHead, JobSelectVerson },
directives: { permission }, directives: { permission },
data() { data() {
return { return {
crmType: "backJob", crmType: "backJob",
JobVersionList: [],
getmaterialGroupValue: "",
rules: { rules: {
versionValue: [ versionValue: [
{ required: true, message: "必须输入!", trigger: "change" }, { required: true, message: "必须输入!", trigger: "change" },
], ],
}, },
JobversionValue: "",
JobversionValueVerson: "",
pickerOptionsCp5: { pickerOptionsCp5: {
disabledDate: (time) => { disabledDate: (time) => {
let now = new Date(); let now = new Date();
@ -541,8 +617,22 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime(); 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: "", startTime: "",
endTime: "", endTime: "",
cp5startTime: "",
cp5endTime: "",
pickerOptionsCp7: { pickerOptionsCp7: {
disabledDate: (time) => { disabledDate: (time) => {
let now = new Date(); let now = new Date();
@ -593,15 +683,14 @@ export default {
searchContent: "", // searchContent: "", //
form: {}, form: {},
formCount: { formCount: {
name: "未结算对比", startTime: "",
// datetime5: [], endTime: "",
// datetime7: [], cp5startTime: "",
settledate: "", cp5endTime: "",
materialCode: "", materialCode: "",
sapMaterialCode: "", sapMaterialCode: "",
chassisNumber: "", chassisNumber: "",
kennCode: "", kennCode: "",
version: "",
}, },
list: null, list: null,
totalCount: 0, totalCount: 0,
@ -667,6 +756,7 @@ export default {
this.getAllVersionList(); this.getAllVersionList();
this.getMaterialGroup(); this.getMaterialGroup();
this.getList(); this.getList();
this.getJobVersionInfo();
// this.getCurrentMonthFirst(); // this.getCurrentMonthFirst();
// this.getCurrentMonthLast(); // this.getCurrentMonthLast();
}, },
@ -713,6 +803,98 @@ export default {
}, },
}, },
methods: { methods: {
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleDelete(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
valueChange(data) {
this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ",";
this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
0,
this.getmaterialGroupValue.length - 1
);
},
//
JobVersionValue(params) {
//
this.JobversionValue = params.value;
this.getList();
},
getJobVersionInfo() {
//
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/Job/versionlist", this.listQuery)
.then((response) => {
this.JobVersionList = [];
response.forEach((element) => {
let options = {};
options.value = element;
options.label = element;
this.JobVersionList.push(options);
});
if (JSON.stringify(this.JobVersionList) != "[]") {
//
this.JobversionValue = this.JobVersionList[0].value;
this.JobversionValueVerson = this.JobVersionList[0].label;
this.getList();
}
})
.catch(() => {
//this.listLoading = false;
});
},
//cp7
getdateValue(val) { getdateValue(val) {
this.startTime = val; this.startTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
@ -721,6 +903,15 @@ export default {
this.endTime = val; this.endTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
}, },
//cp5
getdateValueCp5(val) {
this.cp5startTime = val;
this.getbalanceIndexData();
},
getdateValCp5(val) {
this.cp5endTime = val;
this.getbalanceIndexData();
},
getCurrentMonthFirst() { getCurrentMonthFirst() {
var date = new Date(); var date = new Date();
@ -772,7 +963,7 @@ export default {
response.items.forEach((element) => { response.items.forEach((element) => {
let options = {}; let options = {};
options.value = element.description; options.value = element.description;
options.label = element.description; options.label = element.description + "/" + element.value;
this.materialGroupList.push(options); this.materialGroupList.push(options);
}); });
}) })
@ -786,7 +977,8 @@ export default {
this.datetime5 = []; this.datetime5 = [];
this.startTime = ""; this.startTime = "";
this.endTime = ""; this.endTime = "";
// this.datetime7 = []; this.cp5startTime = "";
this.cp5endTime = "";
}, },
save() { save() {
this.$refs.formCount.validate((valid) => { this.$refs.formCount.validate((valid) => {
@ -797,21 +989,18 @@ export default {
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); this.listExportQuery.begin = this.cp5startTime
if (getdate5 != "[]") { ? this.cp5startTime
alert(this.datetime5[0]);
this.listExportQuery.begin = this.datetime5
? this.datetime5[0] || undefined
: undefined; : undefined;
this.listExportQuery.end = this.datetime5 this.listExportQuery.end = this.cp5endTime
? this.datetime5[1] || undefined ? this.cp5endTime
: undefined; : undefined;
}
if (this.startTime != "") { if (this.startTime != "") {
this.listExportQuery.cp7begin = this.startTime; //CP7 this.listExportQuery.cp7begin = this.startTime; //CP7
} }
@ -822,8 +1011,7 @@ export default {
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.getmaterialGroupValue; //
this.formCount.materialGroupValue; //
} }
console.log( console.log(
"大众准时化结算门板价格差异比对报表-导出条件:" + "大众准时化结算门板价格差异比对报表-导出条件:" +
@ -862,6 +1050,10 @@ export default {
this.formTitle = "报表统计"; this.formTitle = "报表统计";
this.isEdit = false; this.isEdit = false;
this.form = {}; this.form = {};
this.startTime = "";
this.endTime = "";
this.cp5startTime = "";
this.cp5endTime = "";
this.dialogFormVisible = true; this.dialogFormVisible = true;
}, },
filterHandler(value, row, column) { filterHandler(value, row, column) {
@ -977,6 +1169,7 @@ export default {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "大众准时化结算门板价格差异比对报表"; this.listQuery.name = "大众准时化结算门板价格差异比对报表";
this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {

294
vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue

@ -5,6 +5,12 @@
<!-- 搜索 --> <!-- 搜索 -->
<div style="float: left"> <div style="float: left">
<flexbox class="content-header"> <flexbox class="content-header">
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
@ -13,6 +19,14 @@
@click="handleCreate" @click="handleCreate"
>统计 >统计
</el-button> </el-button>
<el-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>删除(支持批量)</el-button
>
</flexbox> </flexbox>
</div> </div>
<!-- 刷新 --> <!-- 刷新 -->
@ -54,8 +68,10 @@
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
@row-click="handleRowClick" @row-click="handleRowClick"
@selection-change="handleSelectionChange"
@filter-change="filterChange" @filter-change="filterChange"
> >
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -372,9 +388,12 @@
<el-select <el-select
v-model="formCount.materialGroupValue" v-model="formCount.materialGroupValue"
size="medium" size="medium"
collapse-tags
multiple
filterable filterable
clearable clearable
style="width: 188px; margin-right: 15px" @change="valueChange"
style="width: 350px; margin-right: 15px"
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option
@ -388,7 +407,7 @@
</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="CP5时间:" /> <el-form-item label="CP5时间:" />
</el-col> </el-col>
@ -407,6 +426,39 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </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>
<el-date-picker
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"
>
</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>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
@ -448,7 +500,12 @@
</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 prop="kennCode"> <el-form-item prop="kennCode">
<el-input v-model="formCount.kennCode" /> <el-input
v-model="formCount.kennCode"
:rows="5"
type="textarea"
placeholder="多个KEEN号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
@ -456,7 +513,12 @@
</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 prop="chassisNumber"> <el-form-item prop="chassisNumber">
<el-input v-model="formCount.chassisNumber" /> <el-input
v-model="formCount.chassisNumber"
:rows="5"
type="textarea"
placeholder="多个底盘号,请以回车换行形式添加!"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -465,19 +527,29 @@
<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="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="materialCode"> <el-form-item prop="materialCode">
<el-input v-model="formCount.materialCode" style="width:450px"/> <el-input
type="textarea"
v-model="formCount.materialCode"
:rows="5"
placeholder="多个客户零件号,请以回车换行形式添加!"
/>
</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 prop="sapMaterialCode"> <el-form-item prop="sapMaterialCode">
<el-input v-model="formCount.sapMaterialCode" /> <el-input
v-model="formCount.sapMaterialCode"
:rows="5"
type="textarea"
placeholder="多个厂内零件号,请以回车换行形式添加!"
/>
</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">
@ -499,16 +571,11 @@ 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 = [ import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
{ id: 0, name: "未结" },
{ id: 1, name: "部分结算" },
{ id: 2, name: "已结" },
/* { id: 3, name: "预批量" }, */
];
export default { export default {
name: "UnInvoiceSettledDetailDiff", name: "UnInvoiceSettledDetailDiff",
components: { Pagination, CRMTableHead }, components: { Pagination, CRMTableHead, JobSelectVerson },
directives: { permission }, directives: { permission },
data() { data() {
@ -519,6 +586,7 @@ export default {
{ required: true, message: "必须输入!", trigger: "change" }, { required: true, message: "必须输入!", trigger: "change" },
], ],
}, },
getmaterialGroupValue: "",
pickerOptionsCp5: { pickerOptionsCp5: {
disabledDate: (time) => { disabledDate: (time) => {
let now = new Date(); let now = new Date();
@ -546,6 +614,19 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime(); 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: "", // startTime: "",
// endTime: "", // endTime: "",
pickerOptionsCp7: { pickerOptionsCp7: {
@ -563,7 +644,7 @@ export default {
}, },
datetime5: [], datetime5: [],
checkedCities: [0], checkedCities: [0],
cities: cityOptions, JobVersionList: [],
selectValue: "", selectValue: "",
selectNameValue: "", selectNameValue: "",
radio: "0", //0 1 radio: "0", //0 1
@ -600,14 +681,15 @@ export default {
formCount: { formCount: {
startTime: "", startTime: "",
endTime: "", endTime: "",
// name: "", cp5startTime: "",
// settledate: "", cp5endTime: "",
// materialCode: "", materialCode: "",
// sapMaterialCode: "", sapMaterialCode: "",
// chassisNumber: "", chassisNumber: "",
// kennCode: "", kennCode: "",
// version: "",
}, },
cp5startTime: "",
cp5endTime: "",
list: null, list: null,
totalCount: 0, totalCount: 0,
listLoading: true, listLoading: true,
@ -629,6 +711,7 @@ export default {
materialGroup: undefined, materialGroup: undefined,
begin: undefined, begin: undefined,
end: undefined, end: undefined,
sapCode: undefined,
}, },
listQuery: { listQuery: {
taskId: "", taskId: "",
@ -672,6 +755,7 @@ export default {
this.getAllVersionList(); this.getAllVersionList();
this.getMaterialGroup(); this.getMaterialGroup();
this.getList(); this.getList();
this.getJobVersionInfo();
}, },
beforeDestroy() { beforeDestroy() {
clearInterval(this.timer); clearInterval(this.timer);
@ -681,7 +765,11 @@ export default {
/* 主表头 */ /* 主表头 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({
label: "版本号",
prop: "type",
width: 85,
});
tempsTabs.push({ tempsTabs.push({
label: "单据流水号", label: "单据流水号",
prop: "taskId", prop: "taskId",
@ -702,10 +790,106 @@ export default {
prop: "createdAt", prop: "createdAt",
width: 150, width: 150,
}); });
tempsTabs.push({
label: "说明",
prop: "remark",
width: 220,
});
return tempsTabs; return tempsTabs;
}, },
}, },
methods: { methods: {
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleDelete(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
valueChange(data) {
this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ",";
this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
0,
this.getmaterialGroupValue.length - 1
);
},
//
JobVersionValue(params) {
//
this.JobversionValue = params.value;
this.getList();
},
getJobVersionInfo() {
//
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/Job/versionlist", this.listQuery)
.then((response) => {
this.JobVersionList = [];
response.forEach((element) => {
let options = {};
options.value = element;
options.label = element;
this.JobVersionList.push(options);
});
if (JSON.stringify(this.JobVersionList) != "[]") {
//
this.JobversionValue = this.JobVersionList[0].value;
this.JobversionValueVerson = this.JobVersionList[0].label;
this.getList();
}
})
.catch(() => {
//this.listLoading = false;
});
},
getdateValue(val) { getdateValue(val) {
this.startTime = val; this.startTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
@ -715,6 +899,16 @@ export default {
this.getbalanceIndexData(); this.getbalanceIndexData();
}, },
//cp5
getdateValueCp5(val) {
this.cp5startTime = val;
this.getbalanceIndexData();
},
getdateValCp5(val) {
this.cp5endTime = val;
this.getbalanceIndexData();
},
getCurrentMonthFirst() { getCurrentMonthFirst() {
var date = new Date(); var date = new Date();
date.setDate(1); date.setDate(1);
@ -765,7 +959,7 @@ export default {
response.items.forEach((element) => { response.items.forEach((element) => {
let options = {}; let options = {};
options.value = element.description; options.value = element.description;
options.label = element.description; options.label = element.description + "/" + element.value;
this.materialGroupList.push(options); this.materialGroupList.push(options);
}); });
}) })
@ -779,7 +973,21 @@ export default {
this.datetime5 = []; this.datetime5 = [];
this.startTime = ""; this.startTime = "";
this.endTime = ""; this.endTime = "";
this.cp5startTime = "";
this.cp5endTime = "";
}, },
// 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;
// }
save() { save() {
this.$refs.formCount.validate((valid) => { this.$refs.formCount.validate((valid) => {
if (valid) { if (valid) {
@ -788,25 +996,19 @@ 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.listExportQuery.sapCode = this.formCount.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); //cp5
if (getdate5 != "[]") { this.listExportQuery.begin = this.cp5startTime
this.listExportQuery.begin = this.datetime5 ? this.cp5startTime
? this.datetime5[0] || undefined
: undefined; : undefined;
this.listExportQuery.end = this.datetime5 this.listExportQuery.end = this.cp5endTime
? this.datetime5[1] || undefined ? this.cp5endTime
: undefined; : undefined;
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
this.listExportQuery.cp7begin = this.startTime this.listExportQuery.cp7begin = this.startTime
? this.startTime ? this.startTime
: undefined; : undefined;
@ -815,15 +1017,12 @@ export default {
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.getmaterialGroupValue; //
this.formCount.materialGroupValue; //
} }
console.log( console.log(
"准时化结算数量差异比对-导出条件:" + "准时化结算数量差异比对-导出条件:" +
JSON.stringify(this.listExportQuery) 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",
@ -857,9 +1056,11 @@ export default {
this.formTitle = "报表统计"; this.formTitle = "报表统计";
this.isEdit = false; this.isEdit = false;
this.form = {}; this.form = {};
this.datetime5 = []; //this.datetime5 = [];
this.startTime = ""; this.startTime = "";
this.endTime = ""; this.endTime = "";
this.cp5startTime = "";
this.cp5endTime = "";
this.dialogFormVisible = true; this.dialogFormVisible = true;
}, },
@ -975,7 +1176,8 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "大众结算未发运核对明细表"; this.listQuery.name = "大众准时化结算数量差异比对表";
this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {

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

@ -20,6 +20,14 @@
@click="handleCreate" @click="handleCreate"
>统计 >统计
</el-button> </el-button>
<el-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>删除(支持批量)</el-button
>
</flexbox> </flexbox>
</div> </div>
<!-- 刷新 --> <!-- 刷新 -->
@ -61,8 +69,10 @@
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
@row-click="handleRowClick" @row-click="handleRowClick"
@selection-change="handleSelectionChange"
@filter-change="filterChange" @filter-change="filterChange"
> >
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -398,7 +408,7 @@
</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="CP5时间:" /> <el-form-item label="CP5时间:" />
</el-col> </el-col>
@ -417,6 +427,40 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </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="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-row> <el-row>
@ -620,7 +664,7 @@ export default {
materialGroup: undefined, materialGroup: undefined,
begin: undefined, begin: undefined,
end: undefined, end: undefined,
sapCode:undefined sapCode: undefined,
}, },
listQuery: { listQuery: {
taskId: "", taskId: "",
@ -717,6 +761,58 @@ export default {
}, },
}, },
methods: { methods: {
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleDelete(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
valueChange(data) { valueChange(data) {
this.getmaterialGroupValue = ""; this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ","; this.getmaterialGroupValue += data + ",";
@ -839,25 +935,29 @@ export default {
this.listExportQuery.materialCode = this.formCount.materialCode; // this.listExportQuery.materialCode = this.formCount.materialCode; //
} }
if (this.formCount.sapMaterialCode != "") { if (this.formCount.sapMaterialCode != "") {
this.listExportQuery.sapCode = this.listExportQuery.sapCode = this.formCount.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
} }
//CP5 //CP5
var getdate5 = JSON.stringify(this.datetime5); // var getdate5 = JSON.stringify(this.datetime5);
if (getdate5 != "[]") { // if (getdate5 != "[]") {
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;
// } else {
// this.listExportQuery.begin = undefined;
// this.listExportQuery.end = undefined;
// }
//CP5
this.listExportQuery.begin = this.startTime
? this.startTime
: undefined; : undefined;
} else { this.listExportQuery.end = this.endTime ? this.endTime : undefined;
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
if (this.formCount.chassisNumber != "") { if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; // this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
} }

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

@ -19,6 +19,14 @@
@click="handleCreate" @click="handleCreate"
>统计 >统计
</el-button> </el-button>
<el-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>删除(支持批量)</el-button
>
</flexbox> </flexbox>
</div> </div>
<!-- 刷新 --> <!-- 刷新 -->
@ -59,9 +67,11 @@
border border
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange"
@row-click="handleRowClick" @row-click="handleRowClick"
@filter-change="filterChange" @filter-change="filterChange"
> >
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -397,7 +407,7 @@
</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="CP5时间:" /> <el-form-item label="CP5时间:" />
</el-col> </el-col>
@ -416,6 +426,39 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </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="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-row> <el-row>
@ -716,6 +759,58 @@ export default {
}, },
}, },
methods: { methods: {
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleDelete(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
valueChange(data) { valueChange(data) {
this.getmaterialGroupValue = ""; this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ","; this.getmaterialGroupValue += data + ",";
@ -843,18 +938,22 @@ export default {
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 != "[]") {
this.listExportQuery.begin = this.datetime5 // this.listExportQuery.begin = this.datetime5
? this.datetime5[0] || undefined // ? this.datetime5[0] || undefined
// : undefined;
// this.listExportQuery.end = this.datetime5
// ? this.datetime5[1] || undefined
// : undefined;
// } else {
// this.listExportQuery.begin = undefined;
// this.listExportQuery.end = undefined;
// }
this.listExportQuery.begin = this.startTime
? this.startTime
: undefined; : undefined;
this.listExportQuery.end = this.datetime5 this.listExportQuery.end = this.endTime ? this.endTime : undefined;
? this.datetime5[1] || undefined
: undefined;
} else {
this.listExportQuery.begin = undefined;
this.listExportQuery.end = undefined;
}
if (this.formCount.chassisNumber != "") { if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; // this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
} }

272
vue/src/views/ux/billManage/kanBanWithCode/index.vue

@ -5,6 +5,12 @@
<!-- 搜索 --> <!-- 搜索 -->
<div style="float: left"> <div style="float: left">
<flexbox class="content-header"> <flexbox class="content-header">
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
@ -13,6 +19,22 @@
@click="handleCreate" @click="handleCreate"
>统计 >统计
</el-button> </el-button>
<el-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>删除(支持批量)</el-button
>
<el-button
class="filter-item"
type="success"
icon="el-icon-check"
size="mini"
@click="handleCreateBills()"
>生成出库单(支持批量)</el-button
>
</flexbox> </flexbox>
</div> </div>
<!-- 刷新 --> <!-- 刷新 -->
@ -54,8 +76,10 @@
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
@row-click="handleRowClick" @row-click="handleRowClick"
@selection-change="handleSelectionChange"
@filter-change="filterChange" @filter-change="filterChange"
> >
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -372,9 +396,12 @@
<el-select <el-select
v-model="formCount.materialGroupValue" v-model="formCount.materialGroupValue"
size="medium" size="medium"
collapse-tags
multiple
filterable filterable
clearable clearable
style="width: 188px; margin-right: 15px" @change="valueChange"
style="width: 350px; margin-right: 15px"
placeholder="请选择" placeholder="请选择"
> >
<el-option <el-option
@ -387,17 +414,88 @@
</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="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-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="10" :xs="24" style="margin-left: -80px">
<el-form-item> <el-form-item>
<el-input v-model="formCount.kanBan" style="width: 300px" /> <el-input
type="textarea"
style="width: 450px"
v-model="formCount.kanBan"
:rows="5"
placeholder="多个看板号,请以回车换行形式添加!"
/>
</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 prop="materialCode">
<el-input
type="textarea"
v-model="formCount.materialCode"
:rows="5"
style="width: 450px"
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="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="sapMaterialCode">
<el-input
v-model="formCount.sapMaterialCode"
:rows="5"
style="width: 450px"
type="textarea"
placeholder="多个厂内零件号,请以回车换行形式添加!"
/>
</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>
@ -414,7 +512,7 @@
<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">
<!-- <el-button type="text" @click="dialogFormVisible = false" <!-- <el-button type="text" @click="dialogFormVisible = false"
@ -435,10 +533,11 @@ 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";
import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
export default { export default {
name: "KanBanWithCode", name: "KanBanWithCode",
components: { Pagination, CRMTableHead }, components: { Pagination, CRMTableHead, JobSelectVerson },
directives: { permission }, directives: { permission },
data() { data() {
@ -494,6 +593,8 @@ export default {
datetime5: [], datetime5: [],
datetime7: [], datetime7: [],
checkedCities: [0], checkedCities: [0],
JobVersionList: [],
getmaterialGroupValue: "",
selectValue: "", selectValue: "",
selectNameValue: "", selectNameValue: "",
radio: "0", //0 1 radio: "0", //0 1
@ -526,6 +627,8 @@ export default {
], ],
customerInfos: "", customerInfos: "",
searchContent: "", // searchContent: "", //
JobversionValue: "",
JobversionValueVerson: "",
form: {}, form: {},
formCount: { formCount: {
name: "未结算对比", name: "未结算对比",
@ -605,6 +708,7 @@ export default {
this.getAllVersionList(); this.getAllVersionList();
this.getMaterialGroup(); this.getMaterialGroup();
this.getList(); this.getList();
this.getJobVersionInfo();
// this.getCurrentMonthFirst(); // this.getCurrentMonthFirst();
// this.getCurrentMonthLast(); // this.getCurrentMonthLast();
}, },
@ -616,7 +720,11 @@ export default {
/* 主表头 */ /* 主表头 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({
label: "版本号",
prop: "type",
width: 85,
});
tempsTabs.push({ tempsTabs.push({
label: "单据流水号", label: "单据流水号",
prop: "taskId", prop: "taskId",
@ -637,6 +745,11 @@ export default {
prop: "createdAt", prop: "createdAt",
width: 150, width: 150,
}); });
tempsTabs.push({
label: "说明",
prop: "remark",
width: 220,
});
// tempsTabs.push({ // tempsTabs.push({
// label: "", // label: "",
// prop: "actionName", // prop: "actionName",
@ -651,6 +764,146 @@ export default {
}, },
}, },
methods: { methods: {
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleDelete(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
//
handleCreateBills(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/wms/WmsJitOutPut", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
valueChange(data) {
this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ",";
this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
0,
this.getmaterialGroupValue.length - 1
);
},
//
JobVersionValue(params) {
//
this.JobversionValue = params.value;
this.getList();
},
getJobVersionInfo() {
//
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/Job/versionlist", this.listQuery)
.then((response) => {
this.JobVersionList = [];
response.forEach((element) => {
let options = {};
options.value = element;
options.label = element;
this.JobVersionList.push(options);
});
if (JSON.stringify(this.JobVersionList) != "[]") {
//
this.JobversionValue = this.JobVersionList[0].value;
this.JobversionValueVerson = this.JobVersionList[0].label;
this.getList();
}
})
.catch(() => {
//this.listLoading = false;
});
},
getdateValue(val) { getdateValue(val) {
this.startTime = val; this.startTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
@ -710,7 +963,7 @@ export default {
response.items.forEach((element) => { response.items.forEach((element) => {
let options = {}; let options = {};
options.value = element.description; options.value = element.description;
options.label = element.description; options.label = element.description + "/" + element.value;
this.materialGroupList.push(options); this.materialGroupList.push(options);
}); });
}) })
@ -742,9 +995,12 @@ export default {
this.formCount.sapMaterialCode; // this.formCount.sapMaterialCode; //
} }
if (this.formCount.materialGroupValue != "") { if (this.formCount.materialGroupValue != "") {
this.listExportQuery.estimateTypeDesc = this.listExportQuery.materialGroup = this.getmaterialGroupValue; //
this.formCount.materialGroupValue; //
} }
this.listExportQuery.begin = this.startTime
? this.startTime
: undefined;
this.listExportQuery.end = this.endTime ? this.endTime : undefined;
console.log( console.log(
"大众看板结算与交货核对明细表-导出条件:" + "大众看板结算与交货核对明细表-导出条件:" +
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)

190
vue/src/views/ux/billManage/sparePart/index.vue

@ -5,6 +5,12 @@
<!-- 搜索 --> <!-- 搜索 -->
<div style="float: left"> <div style="float: left">
<flexbox class="content-header"> <flexbox class="content-header">
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
@ -13,6 +19,22 @@
@click="handleCreate" @click="handleCreate"
>统计 >统计
</el-button> </el-button>
<el-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>删除(支持批量)</el-button
>
<el-button
class="filter-item"
type="success"
icon="el-icon-check"
size="mini"
@click="handleCreateBills()"
>生成出库单(支持批量)</el-button
>
</flexbox> </flexbox>
</div> </div>
<!-- 刷新 --> <!-- 刷新 -->
@ -54,8 +76,10 @@
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
@row-click="handleRowClick" @row-click="handleRowClick"
@selection-change="handleSelectionChange"
@filter-change="filterChange" @filter-change="filterChange"
> >
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
v-for="(item, index) in getDefaultField" v-for="(item, index) in getDefaultField"
:key="index" :key="index"
@ -499,16 +523,11 @@ 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 = [ import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
{ id: 0, name: "未结" },
{ id: 1, name: "部分结算" },
{ id: 2, name: "已结" },
/* { id: 3, name: "预批量" }, */
];
export default { export default {
name: "SparePartReport", name: "SparePartReport",
components: { Pagination, CRMTableHead }, components: { Pagination, CRMTableHead, JobSelectVerson },
directives: { permission }, directives: { permission },
data() { data() {
@ -562,9 +581,9 @@ export default {
}, },
}, },
datetime5: [], datetime5: [],
JobVersionList: [],
datetime7: [], datetime7: [],
checkedCities: [0], checkedCities: [0],
cities: cityOptions,
selectValue: "", selectValue: "",
selectNameValue: "", selectNameValue: "",
radio: "0", //0 1 radio: "0", //0 1
@ -673,6 +692,7 @@ export default {
this.getAllVersionList(); this.getAllVersionList();
this.getMaterialGroup(); this.getMaterialGroup();
this.getList(); this.getList();
this.getJobVersionInfo();
// this.getCurrentMonthFirst(); // this.getCurrentMonthFirst();
// this.getCurrentMonthLast(); // this.getCurrentMonthLast();
}, },
@ -684,7 +704,11 @@ export default {
/* 主表头 */ /* 主表头 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({
label: "版本号",
prop: "type",
width: 85,
});
tempsTabs.push({ tempsTabs.push({
label: "单据流水号", label: "单据流水号",
prop: "taskId", prop: "taskId",
@ -705,6 +729,11 @@ export default {
prop: "createdAt", prop: "createdAt",
width: 150, width: 150,
}); });
tempsTabs.push({
label: "说明",
prop: "remark",
width: 220,
});
// tempsTabs.push({ // tempsTabs.push({
// label: "", // label: "",
// prop: "actionName", // prop: "actionName",
@ -719,6 +748,146 @@ export default {
}, },
}, },
methods: { methods: {
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleDelete(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
//
handleCreateBills(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/wms/WmsJitOutPut", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
valueChange(data) {
this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ",";
this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
0,
this.getmaterialGroupValue.length - 1
);
},
//
JobVersionValue(params) {
//
this.JobversionValue = params.value;
this.getList();
},
getJobVersionInfo() {
//
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/Job/versionlist", this.listQuery)
.then((response) => {
this.JobVersionList = [];
response.forEach((element) => {
let options = {};
options.value = element;
options.label = element;
this.JobVersionList.push(options);
});
if (JSON.stringify(this.JobVersionList) != "[]") {
//
this.JobversionValue = this.JobVersionList[0].value;
this.JobversionValueVerson = this.JobVersionList[0].label;
this.getList();
}
})
.catch(() => {
//this.listLoading = false;
});
},
getdateValue(val) { getdateValue(val) {
this.startTime = val; this.startTime = val;
this.getbalanceIndexData(); this.getbalanceIndexData();
@ -832,8 +1001,7 @@ export default {
this.formCount.materialGroupValue; // this.formCount.materialGroupValue; //
} }
console.log( console.log(
"大众备件结算核对-导出条件:" + "大众备件结算核对-导出条件:" + JSON.stringify(this.listExportQuery)
JSON.stringify(this.listExportQuery)
); );
this.$axios this.$axios
.gets( .gets(

9
vue/static/config.js

@ -2,8 +2,8 @@ let configJSON
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
configJSON = { configJSON = {
base: { base: {
ip: 'http://192.168.0.63',
ip: 'http://192.168.0.140', //ip: 'http://192.168.0.140',
//ip: 'http://149.223.116.5', //ip: 'http://149.223.116.5',
auth_port: '8066', auth_port: '8066',
public_port: '8092', public_port: '8092',
@ -36,8 +36,9 @@ if (process.env.NODE_ENV === 'development') {
// 发布环境 // 发布环境
configJSON = { configJSON = {
base: { base: {
ip: 'http://192.168.0.140',
//ip: 'http://192.168.0.62', ip: 'http://192.168.0.63',
//ip: 'http://192.168.0.140',
//ip: 'http://149.223.116.5', //ip: 'http://149.223.116.5',
//ip: 'http://114.116.225.148', //ip: 'http://114.116.225.148',
//ip: 'http://10.123.148.162', //ip: 'http://10.123.148.162',

Loading…
Cancel
Save