Browse Source

前端代码提交

branch_ccpg_220107
44673626 3 years ago
parent
commit
3cf1399adf
  1. 8
      vue/src/components/ImportExcel-base/index.vue
  2. 364
      vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
  3. 6
      vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
  4. 18
      vue/src/views/ux/billManage/IssuedUnsettled/index.vue
  5. 12
      vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue
  6. 15
      vue/src/views/ux/billManage/UnSettleDiffExport/index.vue
  7. 4
      vue/src/views/ux/billManage/UnSettledDiff/index.vue
  8. 328
      vue/src/views/ux/billManage/kanBanWithCode/index.vue
  9. 223
      vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
  10. 33
      vue/src/views/ux/billManage/kanbanOutOrder/index.vue
  11. 294
      vue/src/views/ux/billManage/sparePart/index.vue
  12. 26
      vue/src/views/ux/billManage/vwOutOrder/index.vue

8
vue/src/components/ImportExcel-base/index.vue

@ -301,8 +301,10 @@ export default {
vWKanBan: "大众看板结算明细", vWKanBan: "大众看板结算明细",
scrapClaims: "CP7报废和索赔", scrapClaims: "CP7报废和索赔",
sparePart: "大众备件结算明细", sparePart: "大众备件结算明细",
hqHPlatform: "红旗H平台导入", hqHPlatform: "红旗H平台",
hqMPlatform: "红旗M平台导入", hqMPlatform: "红旗M平台",
vwoutorder: "准时化出库单",
kanbanoutorder: "大众看板出库单",
bomdatabase: "产品结构BOM", bomdatabase: "产品结构BOM",
prebatch: "预批量", prebatch: "预批量",
secondaryPriceRatio: "二配结算价格比例", secondaryPriceRatio: "二配结算价格比例",
@ -330,6 +332,8 @@ export default {
sparePart: "/api/settleaccount/SparePart/ExcelImport", // sparePart: "/api/settleaccount/SparePart/ExcelImport", //
hqHPlatform: "/api/settleaccount/HQHPlatform/ExcelImport", //H hqHPlatform: "/api/settleaccount/HQHPlatform/ExcelImport", //H
hqMPlatform: "/api/settleaccount/HQMPlatform/ExcelImport", //M hqMPlatform: "/api/settleaccount/HQMPlatform/ExcelImport", //M
vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", //
kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", //
bomdatabase: "/api/settleaccount/bom/ExcelImport", bomdatabase: "/api/settleaccount/bom/ExcelImport",
prebatch: "/api/settleaccount/Prebatch/ExcelImport", prebatch: "/api/settleaccount/Prebatch/ExcelImport",
secondaryPriceRatio: secondaryPriceRatio:

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

@ -32,16 +32,17 @@
type="success" type="success"
icon="el-icon-check" icon="el-icon-check"
size="mini" size="mini"
@click="handleCreateBills()" @click="handleConfirm()"
>生成出库单(支持批量)</el-button >已确认(支持批量)</el-button
> >
<el-button <el-button
class="filter-item" class="filter-item"
type="success" type="warning"
icon="el-icon-check" icon="el-icon-edit"
size="mini" size="mini"
@click="handleConfirm()" v-loading="formLoading"
>已确认</el-button @click="handleCreateBills()"
>生成出库单(支持批量)</el-button
> >
</flexbox> </flexbox>
</div> </div>
@ -63,7 +64,7 @@
</el-tooltip> </el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right" <span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔30秒进行自动刷新</span >说明每间隔3分钟进行自动刷新</span
> >
</flexbox> </flexbox>
</div> </div>
@ -106,7 +107,7 @@
</el-table-column> </el-table-column>
<!-- 操作名称 --> <!-- 操作名称 -->
<el-table-column <!-- <el-table-column
prop="actionName" prop="actionName"
label="操作名称(单击箭头过滤)" label="操作名称(单击箭头过滤)"
width="165" width="165"
@ -130,7 +131,7 @@
</el-tag> </el-tag>
</div> </div>
</template> </template>
</el-table-column> </el-table-column> -->
<!-- 状态 --> <!-- 状态 -->
<el-table-column <el-table-column
prop="stateName" prop="stateName"
@ -816,8 +817,8 @@ export default {
version: "", version: "",
materialCode: undefined, materialCode: undefined,
sapCode: undefined, sapCode: undefined,
cp7begin: undefined, cp7Begin: undefined,
cp7end: undefined, cp7End: undefined,
kenncode: undefined, kenncode: undefined,
chassisNumber: undefined, chassisNumber: undefined,
materialGroup: undefined, materialGroup: undefined,
@ -862,7 +863,7 @@ export default {
this.listQuery.taskId = ""; this.listQuery.taskId = "";
this.listQuery.stateName = ""; this.listQuery.stateName = "";
setTimeout(this.getList, 0); setTimeout(this.getList, 0);
}, 1000 * 30); //30 }, 1000 * 180); //30
// $oncebeforeDestroy // $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => { this.$once("hook:beforeDestroy", () => {
clearInterval(timer); clearInterval(timer);
@ -895,15 +896,15 @@ export default {
prop: "taskId", prop: "taskId",
width: 120, width: 120,
}); });
tempsTabs.push({ // tempsTabs.push({
label: "模块名称", // label: "",
prop: "name", // prop: "name",
width: 170, // width: 180,
}); // });
tempsTabs.push({ tempsTabs.push({
label: "创建人", label: "创建人",
prop: "email", prop: "email",
width: 110, width: 150,
}); });
tempsTabs.push({ tempsTabs.push({
label: "创建时间", label: "创建时间",
@ -913,12 +914,12 @@ export default {
tempsTabs.push({ tempsTabs.push({
label: "说明", label: "说明",
prop: "remark", prop: "remark",
width: 220, width: 350,
}); });
tempsTabs.push({ tempsTabs.push({
label: "审批状态", label: "审批状态",
prop: "fileName", prop: "fileName",
width: 150, width: 350,
}); });
return tempsTabs; return tempsTabs;
}, },
@ -934,7 +935,7 @@ export default {
console.log(this.listQuery.Sorting); console.log(this.listQuery.Sorting);
this.handleFilter(); this.handleFilter();
}, },
/** 筛选操作 */ /** 筛选操作 */
handleFilter() { handleFilter() {
this.page = 1; this.page = 1;
this.getList(); this.getList();
@ -952,163 +953,234 @@ export default {
this.getList(); this.getList();
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.isEdit = false;
this.multipleSelection = [];
this.multipleSelection = val; this.multipleSelection = val;
}, },
//
handleConfirm(row) { handleConfirm(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
this.$message({ this.$message({
message: "至少选择一行!", message: "至少选择一行!",
type: "warning", type: "warning",
}); });
return; return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else { } else {
// var getbillNum = "";
//
this.multipleSelection.forEach((element) => { this.multipleSelection.forEach((element) => {
let id = element.id; let state = element.fileName;
params.push(id); if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
}); });
myalert = "选中项";
} }
this.$confirm("是否确认" + myalert + "?", "提示", { if (this.isEdit == true) {
confirmButtonText: "确定", this.$message({
cancelButtonText: "取消", message:
type: "warning", "已经生成出库单的不能再确认!单号:" +
}) getbillNum.substr(0, getbillNum.length - 1),
.then(() => { type: "warning",
this.$axios });
.posts("/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", params) return;
.then((response) => { } else {
const index = this.list.indexOf(row); var params = [];
this.$notify({ let myalert = ""; //使
title: "成功", if (row) {
message: "操作成功", //
type: "success", params.push(row.id);
duration: 2000, 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/wmsjitoutput/WmsJitOutPutAudit",
params
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.getList();
}); });
this.getList(); })
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
}); }
}, },
// //
handleCreateBills(row) { handleCreateBills(row) {
// if (this.multipleSelection.length == 0) { this.isEdit = false;
// this.$message({ if (this.multipleSelection.length == 0) {
// message: "", this.$message({
// type: "warning", message: "至少选择一行!",
// }); type: "warning",
// return; });
// } return;
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else { } else {
// var getbillNum = "";
//
this.multipleSelection.forEach((element) => { this.multipleSelection.forEach((element) => {
let id = element.id; let state = element.fileName;
params.push(id); if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
}); });
myalert = "选中项";
} }
this.listBillQuery.guids = params; if (this.isEdit == true) {
this.listBillQuery.version = this.JobversionValue; this.$message({
console.log("出库单条件:" + JSON.stringify(this.listBillQuery)); message:
this.$confirm("是否确认出库" + myalert + "?", "提示", { "已经生成出库单的不能再重新生成!单号:" +
confirmButtonText: "确定", getbillNum.substr(0, getbillNum.length - 1),
cancelButtonText: "取消", type: "warning",
type: "warning", });
}) return;
.then(() => { } else {
this.$axios var params = [];
.posts( let myalert = ""; //使
"/api/settleaccount/wmsjitoutput/WmsJitOutPut", if (row) {
this.listBillQuery //
) params.push(row.id);
.then((response) => { myalert = row.name;
console.log( } else {
"检查柱护板-hostCheckQuery" + JSON.stringify(response) //
); this.multipleSelection.forEach((element) => {
const index = this.list.indexOf(row); let id = element.id;
this.$notify({ params.push(id);
title: "成功", });
message: "生成成功", myalert = "选中项";
type: "success", }
duration: 2000, this.listBillQuery.guids = params;
}); this.listBillQuery.version = this.JobversionValue;
console.log("出库单条件:" + JSON.stringify(this.listBillQuery));
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formLoading = true;
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPut",
this.listBillQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList(); this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
}); }
}, },
// //
handleDelete(row) { handleDelete(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
this.$message({ this.$message({
message: "至少选择一行!", message: "至少选择一行!",
type: "warning", type: "warning",
}); });
return; return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else { } else {
// var getbillNum = "";
//
this.multipleSelection.forEach((element) => { this.multipleSelection.forEach((element) => {
let id = element.id; let state = element.fileName;
params.push(id); if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
}); });
myalert = "选中项";
} }
this.$confirm("是否删除" + myalert + "?", "提示", { if (this.isEdit == true) {
confirmButtonText: "确定", this.$message({
cancelButtonText: "取消", message:
type: "warning", "已经生成出库单的不能删除!单号:" +
}) getbillNum.substr(0, getbillNum.length - 1),
.then(() => { type: "warning",
this.$axios });
.posts("/api/settleaccount/Job/delete", params) return;
.then((response) => { } else {
const index = this.list.indexOf(row); var params = [];
this.$notify({ let myalert = ""; //使
title: "成功", if (row) {
message: "删除成功", //
type: "success", params.push(row.id);
duration: 2000, 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();
}); });
this.getList(); })
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
}); }
}, },
// //
JobVersionValue(params) { JobVersionValue(params) {
@ -1279,7 +1351,7 @@ export default {
project: "物料组", project: "物料组",
maxResultCount: 1000, maxResultCount: 1000,
skipCount: 0, skipCount: 0,
sorting:"value ascending" sorting: "value ascending",
}) })
.then((response) => { .then((response) => {
this.materialGroupList = []; this.materialGroupList = [];
@ -1323,10 +1395,10 @@ export default {
this.listExportQuery.end = this.cp5endTime this.listExportQuery.end = this.cp5endTime
? this.cp5endTime ? this.cp5endTime
: undefined; : undefined;
this.listExportQuery.cp7begin = this.startTime this.listExportQuery.cp7Begin = this.startTime
? this.startTime ? this.startTime
: undefined; : undefined;
this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined; this.listExportQuery.cp7End = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") { if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; // this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
} }
@ -1343,7 +1415,7 @@ export default {
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)
); );
this.$axios this.$axios
.gets( .posts(
"/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make", "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
this.listExportQuery this.listExportQuery
) )
@ -1530,13 +1602,11 @@ export default {
/** 通过回调控制style */ /** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) { cellStyle({ row, column, rowIndex, columnIndex }) {
var item = this.list[rowIndex]; var item = this.list[rowIndex];
if (column.property === "stateName") { if (column.property === "fileName") {
if (item.stateName === "Succeeded") { if (item.fileName === "已确认") {
return { color: "#71d87f", cursor: "pointer" }; return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
} else if (item.stateName === "Processing") { } else {
return { color: "#d87171", cursor: "pointer" }; return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
} else if (item.stateName === "Failed") {
return { color: "#ff5640", cursor: "pointer" };
} }
} }
return { textAlign: "left" }; return { textAlign: "left" };

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

@ -47,7 +47,7 @@
</el-tooltip> </el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right" <span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔15秒进行自动刷新</span >说明每间隔3分钟进行自动刷新</span
> >
</flexbox> </flexbox>
</div> </div>
@ -595,7 +595,7 @@ export default {
this.listQuery.taskId = ""; this.listQuery.taskId = "";
this.listQuery.stateName = ""; this.listQuery.stateName = "";
setTimeout(this.getList, 0); setTimeout(this.getList, 0);
}, 1000 * 15); //15 }, 1000 * 180); //180
// $oncebeforeDestroy // $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => { this.$once("hook:beforeDestroy", () => {
clearInterval(timer); clearInterval(timer);
@ -989,7 +989,7 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "发票与结算核对汇总"; this.listQuery.name = "发票与结算核对汇总";
this.listQuery.type = this.JobversionValue; this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)

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

@ -47,7 +47,7 @@
</el-tooltip> </el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right" <span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔15秒进行自动刷新</span >说明每间隔3分钟进行自动刷新</span
> >
</flexbox> </flexbox>
</div> </div>
@ -699,7 +699,7 @@ export default {
this.listQuery.taskId = ""; this.listQuery.taskId = "";
this.listQuery.stateName = ""; this.listQuery.stateName = "";
setTimeout(this.getList, 0); setTimeout(this.getList, 0);
}, 1000 * 15); //15 }, 1000 * 180); //15
// $oncebeforeDestroy // $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => { this.$once("hook:beforeDestroy", () => {
clearInterval(timer); clearInterval(timer);
@ -732,11 +732,11 @@ export default {
prop: "taskId", prop: "taskId",
width: 130, width: 130,
}); });
tempsTabs.push({ // tempsTabs.push({
label: "模块名称", // label: "",
prop: "name", // prop: "name",
width: 170, // width: 170,
}); // });
tempsTabs.push({ tempsTabs.push({
label: "创建人", label: "创建人",
prop: "email", prop: "email",
@ -969,7 +969,7 @@ export default {
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)
); );
this.$axios this.$axios
.gets( .posts(
"/api/settleaccount/ReportMakeService/UnsettledDetailReportService-Make", "/api/settleaccount/ReportMakeService/UnsettledDetailReportService-Make",
this.listExportQuery this.listExportQuery
) )
@ -1119,7 +1119,7 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "大众准时化未结明细表"; this.listQuery.name = "准时化未结明细表";
this.listQuery.type = this.JobversionValue; this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)

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

@ -708,8 +708,8 @@ export default {
listExportQuery: { listExportQuery: {
version: "", version: "",
materialCode: undefined, materialCode: undefined,
cp7begin: undefined, cp7Begin: undefined,
cp7end: undefined, cp7End: undefined,
kenncode: undefined, kenncode: undefined,
chassisNumber: undefined, chassisNumber: undefined,
materialGroup: undefined, materialGroup: undefined,
@ -1014,10 +1014,10 @@ export default {
this.listExportQuery.end = this.cp5endTime this.listExportQuery.end = this.cp5endTime
? this.cp5endTime ? this.cp5endTime
: undefined; : undefined;
this.listExportQuery.cp7begin = this.startTime this.listExportQuery.cp7Begin = this.startTime
? this.startTime ? this.startTime
: undefined; : undefined;
this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined; this.listExportQuery.cp7End = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") { if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; // this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
} }
@ -1029,7 +1029,7 @@ export default {
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)
); );
this.$axios this.$axios
.gets( .posts(
"/api/settleaccount/ReportMakeService/UnInvoiceSettledDetailDiff-Make", "/api/settleaccount/ReportMakeService/UnInvoiceSettledDetailDiff-Make",
this.listExportQuery this.listExportQuery
) )
@ -1181,7 +1181,7 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "准时化量差输出"; this.listQuery.name = "准时化结算数量差异比对输出";
this.listQuery.type = this.JobversionValue; this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)

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

@ -17,7 +17,7 @@
size="mini" size="mini"
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="handleCreate" @click="handleCreate()"
>统计 >统计
</el-button> </el-button>
<el-button <el-button
@ -641,6 +641,10 @@ export default {
formCount: { formCount: {
startTime: "", startTime: "",
endTime: "", endTime: "",
materialCode: undefined,
kenncode: undefined,
chassisNumber: undefined,
sapCode: undefined,
// name: "", // name: "",
// settledate: "", // settledate: "",
// materialCode: "", // materialCode: "",
@ -975,7 +979,7 @@ export default {
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)
); );
this.$axios this.$axios
.gets( .posts(
"/api/settleaccount/ReportMakeService/UnSettleDiffExport-Make", "/api/settleaccount/ReportMakeService/UnSettleDiffExport-Make",
this.listExportQuery this.listExportQuery
) )
@ -1001,9 +1005,12 @@ export default {
}); });
}, },
handleCreate() { handleCreate() {
this.$nextTick(() => { if (this.$refs["formCount"] !== undefined) {
this.$refs["formCount"].resetFields(); this.$refs["formCount"].resetFields();
}); }
// this.$nextTick(() => {
// this.$refs["formCount"].resetFields();
// });
this.formTitle = "报表统计"; this.formTitle = "报表统计";
this.isEdit = false; this.isEdit = false;
this.form = {}; this.form = {};

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

@ -966,7 +966,7 @@ export default {
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)
); );
this.$axios this.$axios
.gets( .posts(
"/api/settleaccount/ReportMakeService/UnSettledDiff-Make", "/api/settleaccount/ReportMakeService/UnSettledDiff-Make",
this.listExportQuery this.listExportQuery
) )
@ -1116,7 +1116,7 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "未结算对比"; this.listQuery.name = "准时化未结明细表";
this.listQuery.type = this.JobversionValue; this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)

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

@ -32,16 +32,17 @@
type="success" type="success"
icon="el-icon-check" icon="el-icon-check"
size="mini" size="mini"
@click="handleCreateBills()" @click="handleConfirm()"
>生成出库单(支持批量)</el-button >已确认(支持批量)</el-button
> >
<el-button <el-button
class="filter-item" class="filter-item"
type="success" type="warning"
icon="el-icon-check" icon="el-icon-edit"
size="mini" size="mini"
@click="handleConfirm()" v-loading="formLoading"
>已确认</el-button @click="handleCreateBills()"
>生成出库单(支持批量)</el-button
> >
</flexbox> </flexbox>
</div> </div>
@ -63,7 +64,7 @@
</el-tooltip> </el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right" <span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔30秒进行自动刷新</span >说明每间隔3分钟进行自动刷新</span
> >
</flexbox> </flexbox>
</div> </div>
@ -105,7 +106,7 @@
</el-table-column> </el-table-column>
<!-- 操作名称 --> <!-- 操作名称 -->
<el-table-column <!-- <el-table-column
prop="actionName" prop="actionName"
label="操作名称(单击箭头过滤)" label="操作名称(单击箭头过滤)"
width="165" width="165"
@ -129,7 +130,7 @@
</el-tag> </el-tag>
</div> </div>
</template> </template>
</el-table-column> </el-table-column> -->
<!-- 状态 --> <!-- 状态 -->
<el-table-column <el-table-column
prop="stateName" prop="stateName"
@ -707,7 +708,7 @@ export default {
this.listQuery.taskId = ""; this.listQuery.taskId = "";
this.listQuery.stateName = ""; this.listQuery.stateName = "";
setTimeout(this.getList, 0); setTimeout(this.getList, 0);
}, 1000 * 30); //30 }, 1000 * 180); //30
// $oncebeforeDestroy // $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => { this.$once("hook:beforeDestroy", () => {
clearInterval(timer); clearInterval(timer);
@ -740,11 +741,11 @@ export default {
prop: "taskId", prop: "taskId",
width: 120, width: 120,
}); });
tempsTabs.push({ // tempsTabs.push({
label: "模块名称", // label: "",
prop: "name", // prop: "name",
width: 170, // width: 170,
}); // });
tempsTabs.push({ tempsTabs.push({
label: "创建人", label: "创建人",
prop: "email", prop: "email",
@ -755,7 +756,7 @@ export default {
prop: "createdAt", prop: "createdAt",
width: 150, width: 150,
}); });
tempsTabs.push({ tempsTabs.push({
label: "说明", label: "说明",
prop: "remark", prop: "remark",
width: 220, width: 220,
@ -763,7 +764,7 @@ export default {
tempsTabs.push({ tempsTabs.push({
label: "审批状态", label: "审批状态",
prop: "fileName", prop: "fileName",
width: 150, width: 350,
}); });
return tempsTabs; return tempsTabs;
}, },
@ -774,149 +775,228 @@ export default {
}, },
// //
handleDelete(row) { handleDelete(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
this.$message({ this.$message({
message: "至少选择一行!", message: "至少选择一行!",
type: "warning", type: "warning",
}); });
return; return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else { } else {
// var getbillNum = "";
//
this.multipleSelection.forEach((element) => { this.multipleSelection.forEach((element) => {
let id = element.id; let state = element.fileName;
params.push(id); if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
}); });
myalert = "选中项";
} }
this.$confirm("是否删除" + myalert + "?", "提示", { if (this.isEdit == true) {
confirmButtonText: "确定", this.$message({
cancelButtonText: "取消", message:
type: "warning", "已经生成出库单的不能删除!单号:" +
}) getbillNum.substr(0, getbillNum.length - 1),
.then(() => { type: "warning",
this.$axios });
.posts("/api/settleaccount/Job/delete", params) return;
.then((response) => { } else {
const index = this.list.indexOf(row); var params = [];
this.$notify({ let myalert = ""; //使
title: "成功", if (row) {
message: "删除成功", //
type: "success", params.push(row.id);
duration: 2000, 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();
}); });
this.getList(); })
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
}); }
}, },
//
handleConfirm(row) { handleConfirm(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
this.$message({ this.$message({
message: "至少选择一行!", message: "至少选择一行!",
type: "warning", type: "warning",
}); });
return; return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else { } else {
// var getbillNum = "";
//
this.multipleSelection.forEach((element) => { this.multipleSelection.forEach((element) => {
let id = element.id; let state = element.fileName;
params.push(id); if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
}); });
myalert = "选中项";
} }
this.$confirm("是否确认" + myalert + "?", "提示", { if (this.isEdit == true) {
confirmButtonText: "确定", this.$message({
cancelButtonText: "取消", message:
type: "warning", "已经生成出库单的不能再确认!单号:" +
}) getbillNum.substr(0, getbillNum.length - 1),
.then(() => { type: "warning",
this.$axios });
.posts("/api/settleaccount/wms/WmsJitOutPut", params) return;
.then((response) => { } else {
const index = this.list.indexOf(row); var params = [];
this.$notify({ let myalert = ""; //使
title: "成功", if (row) {
message: "生成成功", //
type: "success", params.push(row.id);
duration: 2000, 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/wmskanbanoutput/WmsKanbanOutPutAudit",
params
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.getList();
}); });
this.getList(); })
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
}); }
}, },
// //
handleCreateBills(row) { handleCreateBills(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
this.$message({ this.$message({
message: "至少选择一行!", message: "至少选择一行!",
type: "warning", type: "warning",
}); });
return; return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else { } else {
// var getbillNum = "";
//
this.multipleSelection.forEach((element) => { this.multipleSelection.forEach((element) => {
let id = element.id; let state = element.fileName;
params.push(id); if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
}); });
myalert = "选中项";
} }
this.$confirm("是否确认出库" + myalert + "?", "提示", { if (this.isEdit == true) {
confirmButtonText: "确定", this.$message({
cancelButtonText: "取消", message:
type: "warning", "已经生成出库单的不能再重新生成!单号:" +
}) getbillNum.substr(0, getbillNum.length - 1),
.then(() => { type: "warning",
this.$axios });
.posts("/api/settleaccount/wms/WmsJitOutPut", params) return;
.then((response) => { } else {
const index = this.list.indexOf(row); var params = [];
this.$notify({ let myalert = ""; //使
title: "成功", if (row) {
message: "生成成功", //
type: "success", params.push(row.id);
duration: 2000, myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listBillQuery.guids = params;
this.listBillQuery.version = this.JobversionValue;
console.log("出库单条件:" + JSON.stringify(this.listBillQuery));
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formLoading = true;
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut",
this.listBillQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
}); });
this.getList(); })
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
}); }
}, },
valueChange(data) { valueChange(data) {
this.getmaterialGroupValue = ""; this.getmaterialGroupValue = "";
@ -1060,7 +1140,7 @@ export default {
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)
); );
this.$axios this.$axios
.gets( .posts(
"/api/settleaccount/ReportMakeService/SettleKanBan-WithCode", "/api/settleaccount/ReportMakeService/SettleKanBan-WithCode",
this.listExportQuery this.listExportQuery
) )
@ -1229,16 +1309,14 @@ export default {
// }); // });
// }, // },
resetQuery() {}, resetQuery() {},
/** 通过回调控制style */ /** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) { cellStyle({ row, column, rowIndex, columnIndex }) {
var item = this.list[rowIndex]; var item = this.list[rowIndex];
if (column.property === "stateName") { if (column.property === "fileName") {
if (item.stateName === "Succeeded") { if (item.fileName === "已确认") {
return { color: "#71d87f", cursor: "pointer" }; return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
} else if (item.stateName === "Processing") { } else {
return { color: "#d87171", cursor: "pointer" }; return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
} else if (item.stateName === "Failed") {
return { color: "#ff5640", cursor: "pointer" };
} }
} }
return { textAlign: "left" }; return { textAlign: "left" };

223
vue/src/views/ux/billManage/kanbanOutOrder/detail.vue

@ -10,6 +10,12 @@
@click="handleDownload()" @click="handleDownload()"
>导出全部 >导出全部
</el-button> --> </el-button> -->
<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"
type="success" type="success"
@ -21,7 +27,7 @@
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
type="info" type="warning"
icon="el-icon-download" icon="el-icon-download"
@click="handleCancelBills()" @click="handleCancelBills()"
>取消出库(支持批量) >取消出库(支持批量)
@ -106,10 +112,11 @@ import Pagination from "@/components/Pagination"; // secondary package based on
import permission from "@/directive/permission/index.js"; import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead"; import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
export default { export default {
name: "sendUnsettledDiffReport", name: "sendUnsettledDiffReport",
components: { Pagination, CRMTableHead, CRMTableHead }, components: { Pagination, CRMTableHead, CRMTableHead, JobSelectVerson },
directives: { permission }, directives: { permission },
props: { props: {
customerInfos: { customerInfos: {
@ -131,6 +138,7 @@ export default {
searchContent: "", // searchContent: "", //
customerInfo: { customerInfo: {
parentId: "", parentId: "",
version: "",
}, },
form: { form: {
dicDetailID: "", dicDetailID: "",
@ -141,6 +149,13 @@ export default {
totalCount: 0, totalCount: 0,
listLoading: true, listLoading: true,
formLoading: false, formLoading: false,
JobVersionList: [
{ value: "0", label: "未处理" },
{ value: "1", label: "申请出库" },
{ value: "2", label: "确认出库" },
{ value: "3", label: "不能出库" },
{ value: "4", label: "取消出库" },
],
// //
filterObj: { filterObj: {
type: Object, type: Object,
@ -152,27 +167,29 @@ export default {
Filters: [ Filters: [
{ {
logic: 0, logic: 0,
column: "", column: "Enabled",
action: 0, action: 0,
value: "", value: "true",
}, // }, //
], ],
//OrgID:"",
SkipCount: 0, SkipCount: 0,
MaxResultCount: 15, MaxResultCount: 15,
ParentId: "", billNum: "",
}, },
listOutPutQuery: { listOutPutQuery: {
version: "", version: "",
ids: "", guids: "",
billNum: "",
}, },
page: 1, page: 1,
JobversionValue: "",
JobversionValueVerson: "",
dialogFormVisible: false, dialogFormVisible: false,
multipleSelection: [], multipleSelection: [],
formTitle: "", formTitle: "",
drawer: false, drawer: false,
showExcelImport: false, showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 230,
isEdit: false, isEdit: false,
}; };
}, },
@ -194,6 +211,7 @@ export default {
} else { } else {
newVal.forEach((element) => { newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId; this.customerInfo.parentId = element.ParentId;
this.customerInfo.version = element.Version;
}); });
if (this.customerInfo.parentId != "") { if (this.customerInfo.parentId != "") {
this.getList(); this.getList();
@ -210,20 +228,38 @@ export default {
tempsTabs.push({ tempsTabs.push({
label: "版本", label: "版本",
prop: "version", prop: "version",
width: 150, width: 110,
}); });
tempsTabs.push({ tempsTabs.push({
label: "零件号", label: "零件号",
prop: "materialCode", prop: "materialCode",
width: 150, width: 150,
}); });
tempsTabs.push({ label: "KEEN号", prop: "kennCode", width: 170 });
tempsTabs.push({ label: "底盘号", prop: "chassisNumber", width: 190 });
tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 }); tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
tempsTabs.push({ label: "数量", prop: "wmsBillNum", width: 100 }); tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 });
tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs; return tempsTabs;
}, },
}, },
methods: { methods: {
//
JobVersionValue(params) {
//
this.listQuery.Filters = [];
var column = "state";
let filter = {
logic: 0,
column: column,
action: 0,
value: params.value,
};
this.listQuery.Filters.push(filter);
this.getList();
},
// //
handleCancelBills(row) { handleCancelBills(row) {
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
@ -233,8 +269,7 @@ export default {
}); });
return; return;
} }
//var params = []; var params = [];
var params = "";
let myalert = ""; //使 let myalert = ""; //使
if (row) { if (row) {
// //
@ -244,13 +279,14 @@ export default {
// //
this.multipleSelection.forEach((element) => { this.multipleSelection.forEach((element) => {
let id = element.id; let id = element.id;
//params.push(id); params.push(id);
params += id + ",";
}); });
myalert = "选中项"; myalert = "选中项";
} }
this.listOutPutQuery.version = row.version; this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.ids = params.substr(0, params.length - 1); this.listOutPutQuery.guids = params;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log("取消出库条件:" + JSON.stringify(this.listOutPutQuery));
this.$confirm("是否确认取消出库" + myalert + "?", "提示", { this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -260,7 +296,7 @@ export default {
.then(() => { .then(() => {
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPut-Cancel", "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
this.listOutPutQuery this.listOutPutQuery
) )
.then((response) => { .then((response) => {
@ -284,59 +320,96 @@ export default {
// //
handleCreateBills(row) { handleCreateBills(row) {
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
this.$message({ this.listLoading = true;
message: "至少选择一行!", this.listOutPutQuery.guids = [];
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log(
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$confirm("是否全部确认出库?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning", type: "warning",
}); })
return; .then(() => {
} this.$axios
//var params = []; .posts(
var params = ""; "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
let myalert = ""; //使 this.listOutPutQuery
if (row) { )
// .then((response) => {
params.push(row.id); const index = this.list.indexOf(row);
myalert = row.name; this.$notify({
} else { title: "成功",
// message: "生成成功",
this.multipleSelection.forEach((element) => { type: "success",
let id = element.id; duration: 2000,
//params.push(id); });
params += id + ","; this.getList();
}); this.listLoading = false;
myalert = "选中项";
}
this.listOutPutQuery.version = row.version;
this.listOutPutQuery.ids = params.substr(0, params.length - 1);
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
}); });
this.getList(); })
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
this.listLoading = false;
});
} else {
this.listLoading = true;
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.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.guids = params;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log(
"部分选择时确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}) })
.catch(() => { .then(() => {
this.$message({ this.$axios
type: "info", .posts(
message: "已取消操作", "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.listLoading = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
this.listLoading = false;
}); });
}); }
}, },
/** 刷新列表 */ /** 刷新列表 */
handleHandle(data) { handleHandle(data) {
@ -346,6 +419,15 @@ export default {
}, },
/** 格式化字段 */ /** 格式化字段 */
fieldFormatter(row, column) { fieldFormatter(row, column) {
if (column.property == "state") {
return {
0: "未处理",
1: "申请出库",
2: "确认出库",
3: "不能出库",
4: "取消出库",
}[row[column.property]];
}
return row[column.property] || "--"; return row[column.property] || "--";
}, },
importExcelData() { importExcelData() {
@ -402,18 +484,11 @@ export default {
} else { } else {
this.listQuery.SkipCount = (this.page - 1) * 15; this.listQuery.SkipCount = (this.page - 1) * 15;
} }
let filter = { this.listQuery.billNum = this.customerInfo.parentId;
logic: 0,
column: "wmsBillNum",
action: 6,
value: this.customerInfo.parentId,
};
this.listQuery.Filters.push(filter);
//this.listQuery.ParentId = this.customerInfo.parentId;
console.log("查询条件:" + JSON.stringify(this.listQuery)); console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/wmsjitoutput/WmsJitDetailList", "/api/settleaccount/wmskanbanoutput/WmsKanbanDetailList",
this.listQuery this.listQuery
) )
.then((response) => { .then((response) => {

33
vue/src/views/ux/billManage/kanbanOutOrder/index.vue

@ -18,6 +18,14 @@
@click="handleFilter" @click="handleFilter"
>搜索 >搜索
</el-button> </el-button>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleImportExcel()"
>导入文件Excel
</el-button>
</flexbox> </flexbox>
<!--表格渲染--> <!--表格渲染-->
<el-table <el-table
@ -78,6 +86,13 @@
:page.sync="page" :page.sync="page"
:limit.sync="listQuery.MaxResultCount" :limit.sync="listQuery.MaxResultCount"
@pagination="getList" @pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/> />
<!-- 抽屉控件 --> <!-- 抽屉控件 -->
<el-drawer <el-drawer
@ -103,15 +118,16 @@ import Pagination from "@/components/Pagination"; // secondary package based on
import permission from "@/directive/permission/index.js"; import permission from "@/directive/permission/index.js";
import Detail from "./detail"; import Detail from "./detail";
import moment from "moment"; import moment from "moment";
import importExcel from "@/components/ImportExcel-base";
import { formatTimeToTimestamp } from "@/utils/index"; import { formatTimeToTimestamp } from "@/utils/index";
export default { export default {
name: "sendUnsettledDiffReport", name: "sendUnsettledDiffReport",
components: { Pagination, Detail }, components: { Pagination, Detail,importExcel },
directives: { permission }, directives: { permission },
data() { data() {
return { return {
crmType: "sendUnsettledDiffReport", crmType: "kanbanoutorder",
rules: { rules: {
// version: [{ required: true, message: "", trigger: "change" }], // version: [{ required: true, message: "", trigger: "change" }],
// beginTime: [{ required: true, message: "", trigger: "change" }], // beginTime: [{ required: true, message: "", trigger: "change" }],
@ -193,6 +209,11 @@ export default {
}, },
}, },
methods: { methods: {
handleImportExcel() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
getVersionInfo() { getVersionInfo() {
// //
this.listLoading = true; this.listLoading = true;
@ -216,9 +237,11 @@ export default {
handleDrawerOpen(param) { handleDrawerOpen(param) {
this.drawer = true; this.drawer = true;
var parentId = param.billNum; // var parentId = param.billNum; //
var version = param.version; //
this.customerInfos = [ this.customerInfos = [
{ {
ParentId: parentId, ParentId: parentId,
Version: version,
}, },
]; ];
}, },
@ -234,8 +257,8 @@ export default {
} }
return moment(date).format("YYYY-MM-DD HH:mm:ss"); return moment(date).format("YYYY-MM-DD HH:mm:ss");
} }
if (column.property == "documentStatus") { if (column.property == "state") {
return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[ return { 0: "已提交", 1: "已出库", 2: "不能出库" }[
row[column.property] row[column.property]
]; ];
} }
@ -254,7 +277,7 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15; this.listQuery.SkipCount = (this.page - 1) * 15;
} }
this.$axios this.$axios
.posts("/api/settleaccount/wmsjitoutput/WmsJitList", this.listQuery) .posts("/api/settleaccount/wmskanbanoutput/WmsKanbanList", this.listQuery)
.then((response) => { .then((response) => {
this.list = response.items; this.list = response.items;
//alert(JSON.stringify(response.Items)) //alert(JSON.stringify(response.Items))

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

@ -32,16 +32,17 @@
type="success" type="success"
icon="el-icon-check" icon="el-icon-check"
size="mini" size="mini"
@click="handleCreateBills()" @click="handleConfirm()"
>生成出库单(支持批量)</el-button >已确认(支持批量)</el-button
> >
<el-button <el-button
class="filter-item" class="filter-item"
type="success" type="warning"
icon="el-icon-check" icon="el-icon-edit"
size="mini" size="mini"
@click="handleConfirm()" v-loading="formLoading"
>已确认</el-button @click="handleCreateBills()"
>生成出库单(支持批量)</el-button
> >
</flexbox> </flexbox>
</div> </div>
@ -63,7 +64,7 @@
</el-tooltip> </el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right" <span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔30秒进行自动刷新</span >说明每间隔3分钟进行自动刷新</span
> >
</flexbox> </flexbox>
</div> </div>
@ -756,7 +757,7 @@ export default {
this.listQuery.taskId = ""; this.listQuery.taskId = "";
this.listQuery.stateName = ""; this.listQuery.stateName = "";
setTimeout(this.getList, 0); setTimeout(this.getList, 0);
}, 1000 * 30); //30 }, 1000 * 180); //30
// $oncebeforeDestroy // $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => { this.$once("hook:beforeDestroy", () => {
clearInterval(timer); clearInterval(timer);
@ -832,149 +833,228 @@ export default {
}, },
// //
handleDelete(row) { handleDelete(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
this.$message({ this.$message({
message: "至少选择一行!", message: "至少选择一行!",
type: "warning", type: "warning",
}); });
return; return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else { } else {
// var getbillNum = "";
//
this.multipleSelection.forEach((element) => { this.multipleSelection.forEach((element) => {
let id = element.id; let state = element.fileName;
params.push(id); if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
}); });
myalert = "选中项";
} }
this.$confirm("是否删除" + myalert + "?", "提示", { if (this.isEdit == true) {
confirmButtonText: "确定", this.$message({
cancelButtonText: "取消", message:
type: "warning", "已经生成出库单的不能删除!单号:" +
}) getbillNum.substr(0, getbillNum.length - 1),
.then(() => { type: "warning",
this.$axios });
.posts("/api/settleaccount/Job/delete", params) return;
.then((response) => { } else {
const index = this.list.indexOf(row); var params = [];
this.$notify({ let myalert = ""; //使
title: "成功", if (row) {
message: "删除成功", //
type: "success", params.push(row.id);
duration: 2000, 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();
}); });
this.getList(); })
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
}); }
}, },
//
handleConfirm(row) { handleConfirm(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
this.$message({ this.$message({
message: "至少选择一行!", message: "至少选择一行!",
type: "warning", type: "warning",
}); });
return; return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else { } else {
// var getbillNum = "";
//
this.multipleSelection.forEach((element) => { this.multipleSelection.forEach((element) => {
let id = element.id; let state = element.fileName;
params.push(id); if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
}); });
myalert = "选中项";
} }
this.$confirm("是否确认" + myalert + "?", "提示", { if (this.isEdit == true) {
confirmButtonText: "确定", this.$message({
cancelButtonText: "取消", message:
type: "warning", "已经生成出库单的不能再确认!单号:" +
}) getbillNum.substr(0, getbillNum.length - 1),
.then(() => { type: "warning",
this.$axios });
.posts("/api/settleaccounWmsJitOutPutt/wms/", params) return;
.then((response) => { } else {
const index = this.list.indexOf(row); var params = [];
this.$notify({ let myalert = ""; //使
title: "成功", if (row) {
message: "生成成功", //
type: "success", params.push(row.id);
duration: 2000, 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/wmsSharePartoutput/WmsSharePartOutPutAudit",
params
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.getList();
}); });
this.getList(); })
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
}); }
}, },
// //
handleCreateBills(row) { handleCreateBills(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) { if (this.multipleSelection.length == 0) {
this.$message({ this.$message({
message: "至少选择一行!", message: "至少选择一行!",
type: "warning", type: "warning",
}); });
return; return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else { } else {
// var getbillNum = "";
//
this.multipleSelection.forEach((element) => { this.multipleSelection.forEach((element) => {
let id = element.id; let state = element.fileName;
params.push(id); if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
}); });
myalert = "选中项";
} }
this.$confirm("是否确认出库" + myalert + "?", "提示", { if (this.isEdit == true) {
confirmButtonText: "确定", this.$message({
cancelButtonText: "取消", message:
type: "warning", "已经生成出库单的不能再重新生成!单号:" +
}) getbillNum.substr(0, getbillNum.length - 1),
.then(() => { type: "warning",
this.$axios });
.posts("/api/settleaccount/wms/WmsJitOutPut", params) return;
.then((response) => { } else {
const index = this.list.indexOf(row); var params = [];
this.$notify({ let myalert = ""; //使
title: "成功", if (row) {
message: "生成成功", //
type: "success", params.push(row.id);
duration: 2000, myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listBillQuery.guids = params;
this.listBillQuery.version = this.JobversionValue;
console.log("出库单条件:" + JSON.stringify(this.listBillQuery));
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formLoading = true;
this.$axios
.posts(
"/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut",
this.listBillQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
}); });
this.getList(); })
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
}); });
}); }
}, },
valueChange(data) { valueChange(data) {
this.getmaterialGroupValue = ""; this.getmaterialGroupValue = "";

26
vue/src/views/ux/billManage/vwOutOrder/index.vue

@ -18,6 +18,14 @@
@click="handleFilter" @click="handleFilter"
>搜索 >搜索
</el-button> </el-button>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleImportExcel()"
>导入文件Excel
</el-button>
</flexbox> </flexbox>
<!--表格渲染--> <!--表格渲染-->
<el-table <el-table
@ -78,6 +86,13 @@
:page.sync="page" :page.sync="page"
:limit.sync="listQuery.MaxResultCount" :limit.sync="listQuery.MaxResultCount"
@pagination="getList" @pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/> />
<!-- 抽屉控件 --> <!-- 抽屉控件 -->
<el-drawer <el-drawer
@ -103,16 +118,16 @@ import Pagination from "@/components/Pagination"; // secondary package based on
import permission from "@/directive/permission/index.js"; import permission from "@/directive/permission/index.js";
import Detail from "./detail"; import Detail from "./detail";
import moment from "moment"; import moment from "moment";
import importExcel from "@/components/ImportExcel-base";
import { formatTimeToTimestamp } from "@/utils/index"; import { formatTimeToTimestamp } from "@/utils/index";
export default { export default {
name: "sendUnsettledDiffReport", name: "sendUnsettledDiffReport",
components: { Pagination, Detail}, components: { Pagination, Detail,importExcel },
directives: { permission }, directives: { permission },
data() { data() {
return { return {
crmType: "sendUnsettledDiffReport", crmType: "vwoutorder",
rules: { rules: {
// version: [{ required: true, message: "", trigger: "change" }], // version: [{ required: true, message: "", trigger: "change" }],
// beginTime: [{ required: true, message: "", trigger: "change" }], // beginTime: [{ required: true, message: "", trigger: "change" }],
@ -194,6 +209,11 @@ export default {
}, },
}, },
methods: { methods: {
handleImportExcel() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
getVersionInfo() { getVersionInfo() {
// //
this.listLoading = true; this.listLoading = true;

Loading…
Cancel
Save