Browse Source

1 柱护板重打弹窗

2 作废确认窗口行高
3 柱护板报废界面大众顺序号取消范围
4 柱护板报废界面报废自动刷新
5 柱护板报废第一次打开不显示数据
6 柱护板报废成功自动刷新
7 门板作废自动刷新
8 重复报文界面增加单选框
9 柱护板报废提示窗口列表
10 增加未操作时间
11 R100单据状态 已匹配改成未导出
12 R100导出功能
13 M100查询 选择柱护板生产线时 单据状态传入 ZHBBillStatus
branch_ccpg_220107
xunyu.guo 3 years ago
parent
commit
dfd69d58d3
  1. 2
      vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
  2. 225
      vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
  3. 9
      vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
  4. 34
      vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
  5. 2
      vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
  6. 156
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  7. 42
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  8. 637
      vue/src/views/pg-fis/basedate/repeatR100/index.vue
  9. 6
      vue/src/views/pg-fis/basedate/select/index.vue

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

@ -561,7 +561,7 @@ export default {
},
//-
handleUpdate(row) {
var MBVin1 = [];
var MBVin1 = [];
let myalert = ""; //使
if (row) {
//

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

@ -99,9 +99,16 @@
type="success"
icon="el-icon-s-shop"
@click="handleUpdate()"
>重打</el-button
>打印当前页</el-button
>
<el-button
class="filter-item"
size="mini"
type="success"
icon="el-icon-s-shop"
@click="handleUpdateall()"
>打印全部</el-button
>
</el-form-item>
</el-form>
</flexbox>
@ -244,6 +251,7 @@ export default {
customerInfo: {
printType: "1",
productLine: "",
partType: "",
},
//
filterObj: {
@ -261,6 +269,8 @@ export default {
HostSN: undefined,
beginPrintDate: undefined,
endPrintDate: undefined,
beginVin: undefined,
endVin: undefined,
},
listPLQuery: {
BillType: 2,
@ -344,21 +354,16 @@ export default {
tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
tempsTabs.push({
label: "左或右",
prop: "billLocation",
width: 150,
});
tempsTabs.push({
label: "供应商厂家代码",
prop: "providerCode",
width: 150,
});
tempsTabs.push({
label: "零件类型",
prop: "partType",
width: 180,
});
tempsTabs.push({
label: "左或右",
prop: "billLocation",
width: 150,
});
tempsTabs.push({
label: "器具容量",
prop: "capacity",
@ -379,7 +384,6 @@ export default {
prop: "productLine",
width: 120,
});
tempsTabs.push({
label: "起始底盘号",
prop: "beginVin",
@ -390,6 +394,11 @@ export default {
prop: "endVin",
width: 160,
});
tempsTabs.push({
label: "供应商厂家代码",
prop: "providerCode",
width: 150,
});
return tempsTabs;
},
...mapGetters(["userInfo"]), //
@ -425,7 +434,7 @@ export default {
ifr.setAttribute("name", "printPdf" + date);
ifr.src = window.URL.createObjectURL(blob);
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
this.dialogFormVisible = false;
},
@ -463,7 +472,7 @@ export default {
if (this.listQuery.Vin != "") {
this.listQuery.Vin = this.listQuery.Vin;
}
this.listQuery.partType = this.listQuery.partType;
//this.listQuery.partType = this.listQuery.partType;
var getdate5 = JSON.stringify(this.PrintTimeValue);
if (getdate5 != "[]") {
this.listQuery.beginPrintDate = this.PrintTimeValue
@ -487,20 +496,14 @@ export default {
this.listQuery
)
.then((response) => {
response.items.forEach((item)=>{
if(item.printType == 0)
{
response.items.forEach((item) => {
if (item.printType == 0) {
item.printType = "正常打印";
}
else if(item.printType == 1)
{
} else if (item.printType == 1) {
item.printType = "重打";
}
else
{
} else {
item.printType = "补打";
}
});
this.list = response.items;
this.totalCount = response.totalCount;
@ -515,26 +518,167 @@ export default {
},
//-
handleUpdate(row) {
var beginVin1 = [];
let myalert = ""; //使
if (row) {
//
beginVin1.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
beginVin1.push(id);
this.isEdit = true;
if (this.multipleSelection.length != 1) {
this.$message({
message: "重新打印必须选择单行,不能多选!",
type: "warning",
});
myalert = "选中项";
return;
} else {
//this.fetchData(this.multipleSelection[0].id);
//
let beginVin1 = this.multipleSelection[0].id;
let ZHBId = [beginVin1];
var params = {
printType: "1",
productLine: this.customerInfo.productLine,
reportIdList: ZHBId,
partType: this.multipleSelection[0].partType,
dataResultType: "2",
};
console.log("柱护版-主界面传过来的值:" + JSON.stringify(params));
this.$axios
.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.then((response) => {
console.log("柱护版-打印返回的状态:" + 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.item);
console.log(
"柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值:" +
JSON.stringify(this.fileQuery.dataname)
);
debugger
let partNum = 0;
if(params.partType == "A上C上")
{
partNum = 1;
}
else if(params.partType == "B柱下")
{
partNum = 2;
}
else if(params.partType == "A柱下A中")
{
partNum = 3;
}
else if(params.partType == "B柱上")
{
partNum = 4;
}
else if(params.partType == "D柱")
{
partNum = 5;
}
else if(params.partType == "后轮上装饰板")
{
partNum = 6;
}
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban&returnfile="+partNum,
qs.stringify(this.fileQuery)
)
.then((response) => {
this.printpdf(response); //
});
this.getList();
}
})
.catch(() => {});
}
//let beginVin1 = this.multipleSelection[0].id;
let ZHBId = beginVin1;
// var ZHBVin1 = [];
// ZHBVin1.push(row.id);
// let myalert = ""; //使
// this.isEdit = true;
// if (this.multipleSelection.length != 1) {
// this.$message({
// message: "",
// type: "warning",
// });
// return;
// } else {
// // //
// // this.$message({
// // message: "",
// // type: "warning",
// // });
// // return;
// // this.multipleSelection.forEach((element) => {
// // let id = element.id;
// // beginVin1.push(id);
// // });
// // myalert = "";
// //let beginVin1 = this.multipleSelection[0].id;
// let ZHBId = ZHBVin1;
// var params = {
// printType: 1,
// productLine: this.customerInfo.productLine,
// reportIdList: ZHBId,
// };
// console.log("-" + JSON.stringify(params));
// this.$axios
// .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
// .then((response) => {
// console.log("-" + 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.item);
// console.log(
// "-Handlers/Handler1.ashx?report=zhuhuban" +
// JSON.stringify(this.fileQuery.dataname)
// );
// this.$axios
// .posts(
// "/Handlers/Handler1.ashx?report=zhuhuban",
// qs.stringify(this.fileQuery)
// )
// .then((response) => {
// this.printpdf(response); //
// });
// this.getList();
// }
// })
// .catch(() => {});
// }
},
handleUpdateall(row) {
this.isEdit = true;
if (this.multipleSelection.length != 1) {
this.$message({
message: "重新打印必须选择单行,不能多选!",
type: "warning",
});
return;
} else {
//this.fetchData(this.multipleSelection[0].id);
//
debugger;
let beginVin1 = this.multipleSelection[0].id;
let ZHBId = [beginVin1];
var params = {
printType: "1",
productLine: this.customerInfo.productLine,
reportIdList: ZHBId,
//partType: this.multipleSelection[0].partType,
dataResultType: "1",
};
console.log("柱护版-主界面传过来的值:" + JSON.stringify(params));
this.$axios
@ -562,10 +706,11 @@ export default {
.then((response) => {
this.printpdf(response); //
});
this.getList();
this.getList();
}
})
.catch(() => {});
}
},
//-
handleDelete(row) {

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

@ -201,7 +201,7 @@
append-to-body="true"
:visible.sync="dialogTableVisible"
>
<el-table :data="zflist">
<el-table :data="zflist" class="dialogDiv">
<el-table-column
property="billNum"
label="装箱单号"
@ -688,9 +688,10 @@ export default {
type: "success",
duration: 2000,
});
this.getList();
});
this.dialogTableVisible = false;
this.getList();
},
//-
@ -880,6 +881,10 @@ export default {
margin-left: 5px;
margin-right: 5px;
}
.dialogDiv {
max-height:300px;
overflow: auto;
}
</style>

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

@ -36,22 +36,9 @@
<el-form-item label="大众顺序号">
<el-col :span="11">
<el-form-item prop="beginHostSN">
<el-form-item prop="HostSN">
<el-input
v-model="listQuery.beginHostSN"
placeholder=""
clearable
size="small"
style="width: 170px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col class="line" :span="2">-</el-col>
<el-col :span="11">
<el-form-item prop="endHostSN">
<el-input
v-model="listQuery.endHostSN"
v-model="listQuery.HostSN"
placeholder=""
clearable
size="small"
@ -124,7 +111,7 @@
type="danger"
icon="el-icon-delete"
size="mini"
@click="print()"
@click=" print()"
>作废(支持批量)</el-button
>
</el-form-item>
@ -200,13 +187,15 @@
/>
</div>
</div>
<div>
<div >
<el-dialog
title="作废信息"
append-to-body="true"
:visible.sync="dialogTableVisible"
>
<el-table :data="zflist">
<el-table :data="zflist" class="dialogDiv">
<el-table-column
property="billNum"
label="装箱单号"
@ -697,9 +686,10 @@ export default {
type: "success",
duration: 2000,
});
this.getList();
});
this.dialogTableVisible = false;
this.getList();
},
//-
// handleDelete(row) {
@ -771,6 +761,8 @@ export default {
// });
// }
// })
// .catch(() => {});
// },
fetchData(id) {
@ -888,6 +880,10 @@ export default {
margin-left: 5px;
margin-right: 5px;
}
.dialogDiv {
max-height:300px;
overflow: auto;
}
</style>

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

@ -547,7 +547,7 @@ export default {
let beginVin1 = this.multipleSelection[0].beginVin1;
let endVin1 = this.multipleSelection[0].endVin1;
var params = {
printType: "1",
printType: 1,
productLine: this.customerInfo.productLine,
beginVin: beginVin1,
endVin: endVin1,

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

@ -111,6 +111,30 @@
plain
><strong>柱护板作废</strong></el-button
>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="open()"
>测试</el-button
>2Z
<el-button plain @click="open"> 不会自动关闭 </el-button> -->
</el-form-item>
<el-form-item>
<div id="app">
<div
style="
border: solid 1px darkgray;
border-radius: 5px;
margin: 5px;
padding: 5px;
"
>
<span ref="sp01">{{ content01 }}</span>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span ref="sp05">{{ content05 }}</span>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span ref="sp07">{{ content07 }}</span>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span ref="sp08">{{ content08 }}</span>
</div>
</div>
</el-form-item>
<!-- </el-row> -->
@ -385,6 +409,7 @@ import RepetitionMB from "./RepetitionMB.vue";
import RepetitionZHB from "./RepetitionZHB.vue";
import ScrapMB from "./ScrapMB.vue";
import ScrapZHB from "./ScrapZHB.vue";
import { forEach } from "jszip/lib/object";
export default {
name: "M100Online",
@ -421,7 +446,16 @@ export default {
}
};
return {
content01: "",
content05: "",
content07: "",
content08: "",
// minute01: this.timeoutMinutes,
// minute05: this.timeoutMinutes,
// lastTime01: "14:00",
// lastTime05: "14:40",
crmType: "M100Online",
//productLineList:null,
isDisable: false,
drawerMBPrint: false,
drawerMBDelete: false,
@ -569,6 +603,10 @@ export default {
this.tableHeight = offsetHei - boxH - 67 - 79; //57footer79
//this.tableHeight = offsetHei -260
});
let timer = setInterval(() => {
this.open();
}, 50000);
},
created() {
this.billState.forEach((element, index) => {
@ -650,6 +688,99 @@ export default {
...mapGetters(["userInfo"]), //
},
methods: {
open() {
//console.log("-11111111111111111111111111111111111111111" );
let productLineList = { productLineList: [this.listQuery.productLine] };
console.log("门版-主界面传过来的值:" + JSON.stringify(productLineList));
this.$axios
.posts(
"/api/newjit/bill-m100/product-line-timeout-remind",
productLineList
)
.then((response) => {
if (response.status == false) {
this.$message({
message: response.message,
type: "warning",
});
return;
} else {
console.log(
"超时提醒-接口传过来的值:" + JSON.stringify(response.item)
);
if (response.item !== null) {
response.item.forEach((JKITEM) => {
if (JKITEM.productLine = "01") {
this.content01 = "01生产线已经" + JKITEM.timeoutMinutes + "分钟没收到报文";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp01.style.color = "red";
this.$refs.sp01.style.fontWeight = "bold";
}
else{
this.$refs.sp01.style.color = "green";
}
}
if(JKITEM.productLine = "05") {
this.content05 = "05生产线已经" + JKITEM.timeoutMinutes + "分钟没收到报文";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp05.style.color = "red";
this.$refs.sp05.style.fontWeight = "bold";
}
else{
this.$refs.sp05.style.color = "green";
}
}
if(JKITEM.productLine = "07") {
this.content07 = "07生产线已经" + JKITEM.timeoutMinutes + "分钟没收到报文";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp07.style.color = "red";
this.$refs.sp07.style.fontWeight = "bold";
}
else{
this.$refs.sp07.style.color = "green";
}
}
if(JKITEM.productLine = "08") {
this.content08 = JKITEM.productLine+"生产线已经" + JKITEM.timeoutMinutes + "分钟没收到报文";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp08.style.color = "red";
this.$refs.sp08.style.fontWeight = "bold";
}
else{
this.$refs.sp08.style.color = "green";
}
}
});
} else {
this.$message({
message: "获取接口数据",
type: "warning",
});
return;
}
}
});
},
debounceClick() {
console.log("2秒内点击无数次,都只会触发一次");
},
@ -922,6 +1053,7 @@ export default {
console.log(
"日常打印M100查询条件:" + JSON.stringify(this.listQueryList)
);
//this.click();
this.$axios
.gets("/api/newjit/bill-m100/list", this.listQueryList)
.then((response) => {
@ -1354,7 +1486,9 @@ export default {
}
});
})
.catch(() => { this.isDisable = false;});
.catch(() => {
this.isDisable = false;
});
} else {
//
//
@ -1391,12 +1525,12 @@ export default {
console.log("获取文件base64编码");
console.log(response);
this.formLoading = false;
this.isDisable = false;
this.isDisable = false;
this.printpdf(response); //
})
.catch((error) => {
this.formLoading = false;
this.isDisable = false;
this.isDisable = false;
});
}
})
@ -1405,7 +1539,7 @@ export default {
message: response.message,
type: "error",
});
this.isDisable = false;
this.isDisable = false;
return;
});
}
@ -1484,7 +1618,9 @@ export default {
}
});
})
.catch(() => {this.isDisable = false;});
.catch(() => {
this.isDisable = false;
});
} else {
//
//
@ -1521,7 +1657,7 @@ export default {
console.log("获取文件base64编码");
console.log(response);
this.formLoading = false;
this.isDisable = false
this.isDisable = false;
this.printpdf(response); //
})
.catch((error) => {
@ -1535,7 +1671,7 @@ export default {
message: response.message,
type: "error",
});
this.isDisable = false;
this.isDisable = false;
return;
});
}
@ -2130,9 +2266,11 @@ export default {
},
//线
getProductLine() {
this.listPLQuery.UserId = this.userInfo.userId;
console.log("this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId"+this.listPLQuery.UserId);
console.log(
"this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" +
this.listPLQuery.UserId
);
this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => {

42
vue/src/views/pg-fis/basedate/r100Online/index.vue

@ -329,7 +329,7 @@ export default {
],
},
billState: [
{ id: 2, name: "已匹配" },
{ id: 2, name: "未导出" },
{ id: 3, name: "已导出" },
],
valueSelect: "",
@ -512,7 +512,7 @@ export default {
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts("/api/newjit/bill-r100/export", this.listQuery)
.posts("//api/newjit/bill-r100/export-erp-assembly-code", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
@ -719,7 +719,43 @@ export default {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
SAPExport() {},
SAPExport() {
this.listLoading = true;
// this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
// this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts("/api/newjit/bill-r100/export-erp-assembly-code", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
if (filename.indexOf("_") != -1) {
let downName =
filename.slice(0, filename.lastIndexOf("_")) +
filename.slice(filename.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, filename);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
this.listLoading = false;
},
//线
getProductLine() {
this.listPLQuery.UserId = this.userInfo.userId;

637
vue/src/views/pg-fis/basedate/repeatR100/index.vue

@ -2,122 +2,181 @@
<template>
<div class="cr-body-content">
<div ref="box">
<flexbox class="content-header">
<el-form
:model="listQuery"
ref="queryForm"
v-show="showSearch"
:inline="true"
>
<el-form-item label="起始顺序号" prop="HostSNBegin">
<el-input
v-model="listQuery.HostSNBegin"
placeholder="起始顺序号"
clearable
size="small"
style="width: 120px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="结束顺序号" prop="HostSNEnd">
<el-input
v-model="listQuery.HostSNEnd"
placeholder="结束顺序号"
clearable
size="small"
style="width: 120px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="KNR:" prop="KNRBegin">
<el-input
v-model="listQuery.KNRBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="KNREnd">
<el-input
v-model="listQuery.KNREnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="底盘号:" prop="VINBegin">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="VINEnd">
<el-input
v-model="listQuery.VINEnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<flexbox class="content-header">
<el-form
:model="listQuery"
ref="queryForm"
v-show="showSearch"
:inline="true"
>
<!-- <el-form-item label="数据采集点" prop="productType">
<el-checkbox v-model="listQuery.checked1" >M100</el-checkbox>
<el-checkbox v-model="listQuery.checked2" >R100</el-checkbox>
</el-form-item> -->
<el-form-item label="数据采集点" prop="State" >
<el-checkbox-group v-model="listQuery.state">
<el-checkbox
v-for="(item, index) in billState"
:key="item.id"
:label="item.id"
@change="checkedListChange(index)"
>
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="车型代码" prop="VehicleModelCode">
<el-input
v-model="listQuery.VehicleModelCode"
placeholder="请输入总成名称"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产线:" prop="productType">
<el-select
v-model="listQuery.productType"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="ptypeselectChange"
>
<el-option
v-for="item in productTypeList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="productLine">
<el-select
v-model="listQuery.productLine"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="valueselectChange"
>
<el-option
v-for="item in PLChildList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
/>
</el-select>
</el-form-item>
<el-form-item label="版本" prop="Version">
<el-input
v-model="listQuery.Version"
placeholder="请输入总成名称"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="起始顺序号" prop="HostSNBegin">
<el-input
v-model="listQuery.HostSNBegin"
placeholder="起始顺序号"
clearable
size="small"
style="width: 120px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="结束顺序号" prop="HostSNEnd">
<el-input
v-model="listQuery.HostSNEnd"
placeholder="结束顺序号"
clearable
size="small"
style="width: 120px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="KNR:" prop="KNRBegin">
<el-input
v-model="listQuery.KNRBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="KNREnd">
<el-input
v-model="listQuery.KNREnd"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="底盘号:" prop="VINBegin" v-show="isVINShowState">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
:visible.sync="dialogTableVisible"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车型代码" prop="vehicleModelCode">
<el-select
v-model="listQuery.vehicleModelCode"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="valueselectChange1"
>
<el-option
v-for="item in vehicleModelList"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
</el-select>
</el-form-item>
<el-form-item label="上线日期">
<el-date-picker
v-model="OnlineTimeValue"
size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="接收日期">
<el-date-picker
v-model="ReceiveTimeValue"
size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- <el-select
v-model="listQuery.VehicleModelCode"
placeholder="请输入总成名称"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/> -->
<!-- <el-form-item label="单据状态" prop="BillStatus">
<el-form-item label="版本" prop="Version">
<el-input
v-model="listQuery.Version"
placeholder="请输入总成名称"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上线日期">
<el-date-picker
v-model="OnlineTimeValue"
size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="接收日期">
<el-date-picker
v-model="ReceiveTimeValue"
size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="单据状态" prop="BillStatus">
<el-select
v-model="listQuery.BillStatus"
placeholder="请选择"
@ -129,32 +188,32 @@
</el-select>
</el-form-item> -->
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleFilter"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery('queryForm')"
>重置</el-button
>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownload()"
>导出(Excel)查询信息
</el-button>
</el-form-item>
</el-form>
</flexbox>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleFilter"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery('queryForm')"
>重置</el-button
>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownload()"
>导出(Excel)查询信息
</el-button>
</el-form-item>
</el-form>
</flexbox>
</div>
<div class="l-table">
<!--表格渲染-->
@ -249,6 +308,7 @@ import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import { mapGetters } from "vuex";
import Lockr from "lockr";
import moment from "moment";
import message_table from "../../components/mixins/message_table";
@ -285,9 +345,16 @@ export default {
return {
crmType: "bomdatabase",
customerInfos: [],
billState: [
{ id: 2, name: "R100" },
{ id: 3, name: "M100" },
],
isVINShowState:false,
OnlineTimeValue: [],
ReceiveTimeValue: [],
versionValue: "",
customerInfosMB:[],
customerInfosZHB:[],
versionList: [], //
searchContent: "", //
showExcelImport: false,
@ -307,6 +374,11 @@ export default {
},
},
listQuery: {
productType: 1, //1:2:
ProductLine: undefined,
checked1:true,
checked2:true,
SkipCount: 0,
MaxResultCount: 15,
HostSNBegin: undefined,
@ -319,13 +391,39 @@ export default {
VehicleModelCode: undefined,
Version: undefined,
KNR: undefined,
state: [],
},
listPLQuery: {
BillType: 2,
//UserId: this.userinfo.UserId,
},
vehicleModelQuery:{
dicTypeName:"派格车型",
},
page: 1,
//
// VehicleModelCodelist:[
// {id: 1, name: "C8"},
// {id: 2, name: "B8L"},
// {id: 3, name: "CC"},
// {id: 4, name: "BSMV"},
// {id: 5, name: "B9"},
// {id: 6, name: "Q5"},
// ],
productTypeList: [
{ id: 1, name: "门板" },
{ id: 2, name: "柱护板" },
],
showSearch: true,
bomUnit,
PLList: [],
PLChildList: [], //线
multipleSelection: [],
drawer: false,
isShowState: true,
dialogTableVisible: false,
vehicleModelList:[],//list
//tableHeight: document.documentElement.clientHeight - 260,
};
},
@ -338,7 +436,14 @@ export default {
});
},
created() {
this.getList();
//this.getList();
this.billState.forEach((element, index) => {
if (index === 0) {
this.listQuery.state.push(element.id);
}
});
this.getvehicleModel();
this.getProductLine();
},
computed: {
getDefaultField() {
@ -350,11 +455,11 @@ export default {
prop: "knr",
width: 120,
});
// tempsTabs.push({
// label: "",
// prop: "vin",
// width: 130,
// });
tempsTabs.push({
label: "底盘号",
prop: "vin",
width: 130,
});
tempsTabs.push({
label: "上线时间",
prop: "onlineTime",
@ -375,6 +480,17 @@ export default {
prop: "version",
width: 150,
});
tempsTabs.push({
label: "产线",
prop: "printNum",
width: 150,
});
tempsTabs.push({
label: "数据采集点",
prop: "",
width: 150,
});
tempsTabs.push({ label: "单据状态", prop: "billStatus", width: 120 });
tempsTabs.push({
label: "车型名称",
@ -383,8 +499,15 @@ export default {
});
return tempsTabs;
},
...mapGetters(["userInfo"]), //
},
methods: {
ss(data) {
//alert(data);
//
this.valueSelect = data;
this.getList();
},
//
handleDrawerOpen(param) {
this.drawer = true;
@ -461,26 +584,50 @@ export default {
});
});
},
/*单据状态变更 */
checkedListChange(index) {
if (this.listQuery.state.length <= 1) {
this.listQuery.state.push(this.billState[index].id);
} else {
this.listQuery.state = [];
this.listQuery.state.push(this.billState[index].id);
}
if(this.listQuery.state[0]=="3")
{
this.isVINShowState = true;
}
else
{
this.isVINShowState = false;
}
},
/** 重置按钮操作 */
resetQuery(refName) {
this.OnlineTimeValue = [];
this.ReceiveTimeValue = [];
this.listQuery.state = [];
this.$refs[refName].resetFields();
this.handleQuery();
},
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
this.getList();
//this.getList();
// this.getListM100();
// this.getListR100();
},
selectValue(params) {
//
this.versionValue = params.value;
this.getList();
// this.getListM100();
// this.getListR100();
},
selectOptionsChange(item) {
this.getList();
// this.getListM100();
// this.getListR100();
},
importExcelData() {
//
@ -492,6 +639,8 @@ export default {
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
// this.getListM100();
// this.getListR100();
}
},
/** 格式化字段 */
@ -512,8 +661,11 @@ export default {
},
roleFilter(type) {
return projectTypeKeyValue[type];
},
getList(data) {
getList(data){
this.listLoading = true;
if (data != undefined) {
this.listQuery.SkipCount = (this.page - 1) * data.limit;
@ -524,11 +676,38 @@ export default {
this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
}
// if (this.valueSelect != "") {
// this.listQuery.VehicleModelCode = this.valueSelect;
// } else {
// this.listQuery.VehicleModelCode = "";
// }
if (this.ReceiveTimeValue != []) {
this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
}
this.$axios
if(this.listQuery.state[0] == "2")
{
this.dialogTableVisible = false;
console.log("555555555555555555555555555555"+JSON.stringify(this.listQuery));
this.$axios
.gets("/api/newjit/repeat-r100/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
}
else
{
this.dialogTableVisible = true;
this.$axios
.gets("/api/newjit/repeat-m100/list", this.listQuery)
.then((response) => {
this.list = response.items;
@ -541,13 +720,97 @@ export default {
.catch(() => {
this.listLoading = false;
});
},
}
// if (this.billState=== 2) {
// this.$axios
// .gets("/api/newjit/repeat-r100/list", this.listQuery)
// .then((response) => {
// this.list = response.items;
// this.totalCount = response.totalCount;
// setTimeout(() => {
// //
// this.listLoading = false;
// }, 500);
// })
// .catch(() => {
// this.listLoading = false;
// });
// }
// else if(this.billState === 3){
// this.$axios
// .gets("/api/newjit/repeat-m100/list", this.listQuery)
// .then((response) => {
// this.list = response.items;
// this.totalCount = response.totalCount;
// setTimeout(() => {
// //
// this.listLoading = false;
// }, 500);
// })
// .catch(() => {
// this.listLoading = false;
// });
// }
//}
},
// getList(data) {
// this.listLoading = true;
// if (data != undefined) {
// this.listQuery.SkipCount = (this.page - 1) * data.limit;
// } else {
// this.listQuery.SkipCount = (this.page - 1) * 15;
// }
// if (this.OnlineTimeValue != []) {
// this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
// this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
// }
// if (this.ReceiveTimeValue != []) {
// this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
// this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
// }
// if (this.listQuery.state !== undefined) {
// this.listQuery.billStatus = this.listQuery.state[0];
// }
// //this.listQueryList.ProductLine = this.listQuery.productLine;
// this.$axios
// .gets("/api/newjit/repeat-m100/list", this.listQuery)
// .then((response) => {
// this.list = response.items;
// this.totalCount = response.totalCount;
// setTimeout(() => {
// //
// this.listLoading = false;
// }, 500);
// })
// .catch(() => {
// this.listLoading = false;
// });
// },
handleFilter() {
this.dialogTableVisible = false;
this.page = 1;
this.getList();
// this.getListM100();
// this.getListR100();
},
//线
ptypeselectChange() {
debugger
this.$forceUpdate();
//console.log("222222222222222222222222222222222222222222"+this.listQuery.productType);
this.listQuery.productLine = "";
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
console.log(this.PLList)
},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
@ -557,9 +820,85 @@ export default {
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
getProductLine() {
//debugger
//console.log(JSON.stringify(this.userInfo));
this.listPLQuery.UserId = this.userInfo.userId;
console.log("this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId"+this.listPLQuery.UserId);
this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => {
//console.log("线"+JSON.stringify(response.item));
this.PLList = response.item;
this.PLChildList = this.PLList.filter(
(u) => u.productType === parseInt(this.listQuery.productType)
).sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
console.log("2222222获取产线数据:"+JSON.stringify(this.PLChildList));
this.listQuery.productLine = this.PLChildList[0].productLineCode;
if (this.listQuery.productLine != "") {
//线
this.customerInfosMB = [
{
PrintType: 1,
ProductLine: this.PLChildList[0].productLineCode,
},
];
}
this.getList();
// this.getListM100();
// this.getListR100();
//console.log(this.PLList)
})
.catch(() => {});
},
valueselectChange1(){},
valueselectChange(val) {
this.$forceUpdate();
this.customerInfosMB = [];
this.customerInfosZHB = [];
if (this.listQuery.productType === 1) {
//线
this.customerInfosMB = [
{
PrintType: 1,
ProductLine: val,
},
];
}
if (this.listQuery.productType === 2) {
//线
this.customerInfosZHB = [
{
PrintType: 1,
ProductLine: val,
},
];
}
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
getvehicleModel()
{
this.$axios
.gets(
"/api/newjit/dic/list",this.vehicleModelQuery
)
.then((response) => {
//console.log(response);
this.vehicleModelList = response.item;
//console.log()
})
.catch(() => {
});
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {

6
vue/src/views/pg-fis/basedate/select/index.vue

@ -500,6 +500,7 @@ export default {
ReceiveTimeEnd: undefined,
billStatus: undefined,
state: [],
ZHBBillStatus: undefined,
},
listExportQuery: {
erpAssemblyCode: undefined,
@ -807,6 +808,11 @@ export default {
if (this.listQuery.state !== undefined) {
this.listQuery.billStatus = this.listQuery.state[0];
}
if (this.listQuery.productType === 2) {
this.listQuery.ZHBBillStatus = 2;
} else {
this.listQuery.ZHBBillStatus = 0;
}
this.$axios
.gets("/api/newjit/bill-m100/list", this.listQuery)
.then((response) => {

Loading…
Cancel
Save