@@ -164,7 +164,7 @@
>
{
@@ -598,7 +597,7 @@ export default {
// } else if (response.status === true) {
// this.fileQuery.dataname = JSON.stringify(response.item);
// console.log(
- // "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+ // "调用Handlers/Handler1.ashx?report=menban传的值：" +
// JSON.stringify(this.fileQuery.dataname)
// );
// this.$axios
@@ -615,8 +614,8 @@ export default {
// .catch(() => {});
debugger //重新打印
- var params = MBVin1; //选中的门板ID列表
- console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+ var params = MBVin1; //选中的ID列表
+ console.log("打印-主界面传过来的值：" + JSON.stringify(params));
this.$axios
.posts("/api/newjit/bill-m100/load-menban-report", params)
.then((response) => {
@@ -631,7 +630,7 @@ export default {
} else if (response.status === true) {
this.fileQuery.dataname = JSON.stringify(response.item);
console.log(
- "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+ "调用Handlers/Handler1.ashx?report=menban传的值：" +
JSON.stringify(this.fileQuery.dataname)
);
this.$axios
@@ -650,7 +649,7 @@ export default {
},
- //作废操作，支持批量操作-门板
+ //作废操作，支持批量操作
handleDelete(row) {
//批量删除
var params = [];
@@ -748,7 +747,6 @@ export default {
roleFilter(type) {
return projectTypeKeyValue[type];
},
- //门板
handleFilter() {
this.page = 1;
this.getList();
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
index 22a0146..5e4b6dc 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
@@ -138,7 +138,7 @@
>
{
@@ -617,7 +616,7 @@ export default {
} else if (response.status === true) {
this.fileQuery.dataname = JSON.stringify(response.item);
console.log(
- "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+ "调用Handlers/Handler1.ashx?report=menban传的值：" +
JSON.stringify(this.fileQuery.dataname)
);
this.$axios
@@ -663,7 +662,7 @@ export default {
this.fileQuery.dataname = JSON.stringify(response);
this.zflist = response;
console.log(
- "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+ "调用Handlers/Handler1.ashx?report=menban传的值：" +
JSON.stringify(this.fileQuery.dataname)
);
}
@@ -680,7 +679,7 @@ export default {
.posts("/api/newjit/MenBanPackingList/scrap", params)
.then((response) => {
console.log(
- "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+ "调用Handlers/Handler1.ashx?report=menban传的值：" +
JSON.stringify(response)
);
this.$notify({
@@ -695,7 +694,7 @@ export default {
},
- //作废操作，支持批量操作-门板
+ //作废操作，支持批量操作
// handleDelete(row) {
// //批量删除
// var params = [];
@@ -731,7 +730,7 @@ export default {
// myalertcount.push(itemsss.billNum);
// });
// console.log(
- // "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+ // "调用Handlers/Handler1.ashx?report=menban传的值：" +
// JSON.stringify(this.fileQuery.dataname)
// );
// this.$confirm(
@@ -822,7 +821,6 @@ export default {
roleFilter(type) {
return projectTypeKeyValue[type];
},
- //门板
handleFilter() {
this.page = 1;
this.getList();
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex copy.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex copy.vue
new file mode 100644
index 0000000..9a22c3e
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex copy.vue
@@ -0,0 +1,1993 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.vin
+ }}
+
+
+
+
+ {{ scope.column.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ this.getPrintProductName(1) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ this.getPrintProductName(2) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -9,24 +9,6 @@
v-show="showSearch"
:inline="true"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
重置刷新
打印门板发货排序单
+ >打印发货排序单
- 重新打印门板
-
- 门板补打
+ 重新打印
+
门板作废
-
-
- 重新打印柱护板
-
-
-
- 柱护板补打
-
-
- 柱护板作废
-
+ 作废
+
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -243,19 +100,20 @@
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
- class="cr-table"
+ class="cr-table m100MainTable"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
- stripe
- border
+ :border="true"
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
+ :row-style="setRowStyle"
+ :row-class-name="tableRowClassName"
>
+
+
+
+
@@ -309,8 +191,6 @@
{{ this.getPrintProductName(1) }}
@@ -319,7 +199,6 @@
-
-
-
- {{ this.getPrintProductName(2) }}
-
-
-
-
-
-
-
-
确认
-
@@ -430,6 +284,7 @@
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
+ :layout="'total, prev, pager, next'"
/>
{
- // element=this.listQuery.productLine;
- // });
-
- //let productLineList = { productLineList: [this.listQuery.productLine] };
- // this.$refs.sp01.Visible = false;
- // this.$refs.sp05.Visible = false;
- // this.$refs.sp07.Visible = false;
- // this.$refs.sp08.Visible = false;
-
let productLineListMain = { productLineList: [] };
-
this.PLChildList.forEach((itm) => {
productLineListMain.productLineList.push(itm.productLineCode);
});
-
console.log("门版-主界面传过来的值：" + JSON.stringify(productLineListMain));
this.$axios
.posts(
@@ -813,71 +593,11 @@ export default {
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//写提示信息
_style = "color:red;font-weight:bold"
- // this.$refs.sp01.style.color = "red";
- // this.$refs.sp01.style.fontWeight = "bold";
} else {
_style = "color:green"
- // this.$refs.sp01.style.color = "green";
}
_item = `${JKITEM.productLine}生产线已经${JKITEM.timeoutMinutes}分钟没收到报文\xa0\xa0\xa0\xa0`
this.tipper += _item
- // if (JKITEM.productLine == "01") {
- // this.$refs.sp01.Visible = true;
- // this.content01 =
- // "01生产线已经" +
- // JKITEM.timeoutMinutes +
- // "分钟没收到报文\xa0\xa0\xa0\xa0";
- // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
- // //写提示信息
- // this.$refs.sp01.style.color = "red";
- // this.$refs.sp01.style.fontWeight = "bold";
- // } else {
- // this.$refs.sp01.style.color = "green";
- // }
- // }
- // if (JKITEM.productLine == "05") {
- // this.$refs.sp05.Visible = true;
- // this.content05 =
- // "05生产线已经" +
- // JKITEM.timeoutMinutes +
- // "分钟没收到报文\xa0\xa0\xa0\xa0";
- // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
- // //写提示信息
- // this.$refs.sp05.style.color = "red";
- // this.$refs.sp05.style.fontWeight = "bold";
- // } else {
- // this.$refs.sp05.style.color = "green";
- // }
- // }
- // if (JKITEM.productLine == "07") {
- // this.$refs.sp07.Visible = true;
- // this.content07 =
- // "07生产线已经" +
- // JKITEM.timeoutMinutes +
- // "分钟没收到报文\xa0\xa0\xa0\xa0";
- // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
- // //写提示信息
- // this.$refs.sp07.style.color = "red";
- // this.$refs.sp07.style.fontWeight = "bold";
- // } else {
- // this.$refs.sp07.style.color = "green";
- // }
- // }
- // if (JKITEM.productLine == "08") {
- // this.$refs.sp08.Visible = true;
- // this.content08 =
- // JKITEM.productLine +
- // "生产线已经" +
- // JKITEM.timeoutMinutes +
- // "分钟没收到报文";
- // if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
- // //写提示信息
- // this.$refs.sp08.style.color = "red";
- // this.$refs.sp08.style.fontWeight = "bold";
- // } else {
- // this.$refs.sp08.style.color = "green";
- // }
- // }
});
} else {
this.$message({
@@ -895,15 +615,10 @@ export default {
},
//大众顺序号起止事件改变
beginHostSNChange(val) {
- if (this.listQuery.productType === 1) {
- this.form.endHostSN =
- parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
- } else if (this.listQuery.productType === 2) {
- this.form.endHostSN =
- parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
- }
+ this.form.endHostSN =
+ parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
},
- //门板打印数量更改
+ //打印数量更改
valueNumChange(val) {
this.printNum = val;
if (val == 12) {
@@ -916,7 +631,6 @@ export default {
.then((response) => {
if (response.item !== null) {
this.form.beginHostSN = parseInt(response.item);
- //门板
this.form.endHostSN = parseInt(response.item) + 11;
} else {
this.$message({
@@ -931,75 +645,6 @@ export default {
this.form.endHostSN =
parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
}
- // this.$axios
- // .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
- // .then((response) => {
- // if (response.item !== null) {
- // this.form.beginHostSN = parseInt(response.item);
- // if (val == 12) {
- // //门板
- // this.form.endHostSN = parseInt(response.item) + 11;
- // } else {
- // this.form.endHostSN =
- // parseInt(response.item) + parseInt(this.printNum) - 1;
- // }
- // } else {
- // this.$message({
- // message: "获取不到大众顺序号",
- // type: "warning",
- // });
- // return;
- // }
- // });
- },
- //柱护板打印更改
- valueNumChangeZHB(val) {
- this.printNumZHB = val;
- if (val == 12) {
- //默认值是12
- this.$axios
- .gets(
- "/api/newjit/bill-m100/get-print-start-hostsn2",
- this.hostSNQuery
- )
- .then((response) => {
- if (response.item !== null) {
- this.form.beginHostSN = parseInt(response.item);
- //门板
- this.form.endHostSN = parseInt(response.item) + 11;
- } else {
- this.$message({
- message: "获取不到大众顺序号",
- type: "warning",
- });
- return;
- }
- });
- } else {
- //起止顺序号默认数量不为12
- this.form.endHostSN =
- parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
- }
- // this.$axios
- // .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
- // .then((response) => {
- // if (response.item !== null) {
- // this.form.beginHostSN = parseInt(response.item);
- // if (val == 24) {
- // //柱护板
- // this.form.endHostSN = parseInt(response.item) + 23;
- // } else {
- // this.form.endHostSN =
- // parseInt(response.item) + this.printNumZHB - 1;
- // }
- // } else {
- // this.$message({
- // message: "获取不到大众顺序号",
- // type: "warning",
- // });
- // return;
- // }
- // });
},
//抽屉
handleDrawerOpen(param) {
@@ -1021,7 +666,6 @@ export default {
.gets("/api/newjit/assembly-cfg-erp/" + id)
.then((response) => {
this.form = response.item;
- //this.details = response.item.details;
});
},
/** 导出功能 assembly-cfg-erp/export */
@@ -1088,7 +732,6 @@ export default {
importExcelData() {
//关闭导入窗体时调用
this.showExcelImport = false;
- //this.getList();
},
/** 刷新列表 */
@@ -1141,27 +784,34 @@ export default {
} else {
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.ZHBBillStatus = 0;
+ this.listQuery.ZHBBillStatus = 0;
this.listQueryList.BillStatus = 2; //状态
this.listQueryList.ProductLine = this.listQuery.productLine; //产线
this.listQueryList.CanNotPrint = false; //不可打印
this.listQueryList.GroupName = this.listQuery.GroupName
console.log("日常打印M100查询条件：" + JSON.stringify(this.listQueryList));
- //this.click();
this.$axios
- .gets("/api/newjit/bill-m100/list", this.listQueryList)
+ .gets("/api/newjit/bill-m100/list2", this.listQueryList)
.then((response) => {
- this.list = response.items;
- this.totalCount = response.totalCount;
+ // this.tableColums_detail = []
+ // response.billM100s[0].billM100Parts.forEach((item,index)=>{
+ // for(let i in item){
+ // if(i == 'partCode'){
+ // this.tableColums_detail.push(
+ // { label: index+'-'+i, prop: i,index:index},
+ // )
+ // }
+ // }
+ // })
+ // console.log(888,this.tableColums_detail)
+ // console.log('_100Data',_100Data)
+ this.list = response.billM100s;
+ let _M110Row = response.bill_M110s[0]
+ _M110Row.isM110Data = true
+ this.list.push(_M110Row)
+ // this.M110List = response.bill_M110s;
+ this.totalCount = response.m100_TotalCount;
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
@@ -1186,8 +836,6 @@ export default {
} else {
this.list = response.item.details;
}
- //alert(JSON.stringify(response.Items))
- //this.totalCount = response.totalCount;
setTimeout(() => {
//大数据量加载时
this.listLoading = false;
@@ -1198,32 +846,18 @@ export default {
});
},
// 向子组件更新值
- valueselectChange(val) {
+ productLineChange(val) {
this.$forceUpdate();
this.customerInfosMB = [];
- this.customerInfosZHB = [];
- if (this.listQuery.productType === 1) {
- //把产线值传到子组件
- this.customerInfosMB = [
- {
- PrintType: 1,
- ProductLine: this.listQuery.productLine,
- },
- ];
- }
- if (this.listQuery.productType === 2) {
- //把产线值传到子组件
- this.customerInfosZHB = [
- {
- PrintType: 1,
- ProductLine: this.listQuery.productLine,
- GroupName:this.listQuery.GroupName
- },
- ];
- }
+ //把产线值传到子组件
+ this.customerInfosMB = [
+ {
+ PrintType: 1,
+ ProductLine: this.listQuery.productLine,
+ },
+ ];
+ this.handleFilter()
},
- handleImportSAP() {},
-
handleFilter() {
this.page = 1;
this.getList();
@@ -1240,6 +874,21 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val;
},
+ // m110固定底部
+ setRowStyle({ row }) {
+ //当有 totalDemandText属性时
+ return row.isM110Data ? {
+ background: "#fbc4c4", fontWeight: "bold", position: "-webkit-sticky", position: "sticky",
+ bottom: row.isFixed ? '40px' : 0
+ } : {}
+ },
+ tableRowClassName({ row }){
+ if(row.isM110Data){
+ return 'isM110DataRow'
+ }else{
+ return ''
+ }
+ },
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
@@ -1257,29 +906,19 @@ export default {
}
},
handleRowClick(row, column, event) {
- //this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
closeDialog() {},
// 获取打印模板弹窗的产线名称
getPrintProductName(type){
- // 门板
- let _name = ""
let _productLineName = ""
this.PLChildList.forEach(item=>{
if(item.productLineCode == this.listQuery.productLine){
_productLineName = item.productLineName
}
})
- if(type == 1){
- _name = this.productTypeList[0].name + ': ' + _productLineName
- }
- // 柱护板
- else if(type == 2){
- _name = this.productTypeList[1].name + ': ' + _productLineName + ' (' + this.listQuery.GroupName + ')'
- }
- return _name
+ return _productLineName
},
/**打印 */
print() {
@@ -1302,112 +941,56 @@ export default {
});
return;
}
- if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === undefined)){
- this.$message({
- message: "请选择生产线",
- type: "warning",
- });
- return;
- }
- (this.printNum = "12"),
- (this.printNumZHB = "24"),
- (this.hostSNQuery.productLine = this.listQuery.productLine);
+ (this.hostSNQuery.productLine = this.listQuery.productLine);
this.hostPrintQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.GroupName = this.listQuery.GroupName;
this.hostSNQuery.GroupName = this.listQuery.GroupName
-
- //后端服务更改了 前端跟着更改成以下方式
- if (this.listQuery.productType === 1) {
- //门板
- this.hostSNQuery.isZhuHuBan = "0";
- console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
- this.$axios
- .gets(
- "/api/newjit/bill-m100/get-print-start-hostsn2",
- this.hostSNQuery
- )
- .then((response) => {
- console.log("获取hostsn大众顺序号起始",response.item);
- if (response.item !== null) {
- this.form.beginHostSN = parseInt(response.item);
- if (this.listQuery.productType === 1) {
- this.form.endHostSN = parseInt(response.item) + 11;
- } else if (this.listQuery.productType === 2) {
- //柱护板
- this.form.endHostSN = parseInt(response.item) + 23;
- }
- } else {
- this.$message({
- message: "获取不到大众顺序号",
- type: "warning",
- });
- return;
- }
- });
- } else if (this.listQuery.productType === 2) {
- //柱护板
- this.hostSNQuery.isZhuHuBan = "1";
- console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-
- this.$axios
- .gets(
- "/api/newjit/bill-m100/get-print-start-hostsn2",
- this.hostSNQuery
- )
- .then((response) => {
- console.log("获取hostsn大众顺序号起始");
- if (response.item !== null) {
- this.form.beginHostSN = parseInt(response.item);
- if (this.listQuery.productType === 1) {
- //门板
- this.form.endHostSN = parseInt(response.item) + 11;
- } else if (this.listQuery.productType === 2) {
- //柱护板
- this.form.endHostSN = parseInt(response.item) + 23;
+ // 获取数量
+ this.listLoading = true
+ this.$axios.gets("/api/newjit/dic/list?dicTypeName=零件大类")
+ .then(res=>{
+ let _currentLines = res.item.filter(item=>item.dicItemSort2 == this.listQuery.productLine)
+ if(_currentLines && _currentLines.length > 0){
+ this.printNum = _currentLines[0].dicItemSort9
+ }
+ //后端服务更改了 前端跟着更改成以下方式
+ this.hostSNQuery.isZhuHuBan = "0";
+ console.log("hostsn2参数" + JSON.stringify(this.hostSNQuery));
+ this.$axios
+ .gets(
+ "/api/newjit/bill-m100/get-print-start-hostsn2",
+ this.hostSNQuery
+ )
+ .then((response) => {
+ console.log("获取hostsn大众顺序号起始",response.item);
+ if (response.item !== null) {
+ this.form.beginHostSN = parseInt(response.item);
+ this.form.endHostSN = parseInt(response.item) + (Number(this.printNum) - 1);
+ } else {
+ this.$message({
+ message: "获取不到大众顺序号",
+ type: "warning",
+ });
+ return;
}
- } else {
- this.$message({
- message: "获取不到大众顺序号",
- type: "warning",
- });
- return;
- }
- });
- }
- if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") {
- // this.productName = "";
- // switch (this.listQuery.productLine) {
- // case "01":
- // this.productName = "总装-01";
- // break;
- // case "05":
- // this.productName = "总装-05";
- // break;
- // case "07":
- // this.productName = "总装-07";
- // break;
- // case "08":
- // this.productName = "总装-08";
- // break;
- // }
- this.formTitle = "打印-门板发货排序单";
- } else {
- // this.productName = "";
- // switch (this.listQuery.productLine) {
- // case "08":
- // this.productName = "总装-柱护板";
- // break;
- // }
- this.formTitle = "打印-柱护板发货排序单";
- }
- //this.formTitle = "打印";
- this.dialogFormVisible = true;
- this.form = {
- beginHostSN: "",
- endHostSN: "",
- };
- this.isShowHostSN = true;
- this.isShowVin = false;
+ });
+ if (this.$refs.btn1.$el.innerText === "打印发货排序单") {
+ this.formTitle = "打印-发货排序单";
+ } else {
+ this.formTitle = "打印-柱护板发货排序单";
+ }
+ this.dialogFormVisible = true;
+ this.form = {
+ beginHostSN: "",
+ endHostSN: "",
+ };
+ this.isShowHostSN = true;
+ this.isShowVin = false;
+ this.listLoading = false
+ })
+ .catch(err=>{
+ this.listLoading = false
+ })
},
/**重打 */
rePrint() {
@@ -1432,13 +1015,6 @@ export default {
});
return;
}
- if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === undefined)){
- this.$message({
- message: "请选择生产线",
- type: "warning",
- });
- return;
- }
this.formTitle = "重打";
this.hostPrintQuery.productLine = this.listQuery.productLine;
this.dialogFormVisible = true;
@@ -1472,13 +1048,6 @@ export default {
});
return;
}
- if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === undefined)){
- this.$message({
- message: "请选择生产线",
- type: "warning",
- });
- return;
- }
this.formTitle = "补打";
this.hostPrintQuery.productLine = this.listQuery.productLine;
this.dialogFormVisible = true;
@@ -1493,7 +1062,6 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
- //this.listLoaddingPrint = true;
if (this.isShowHostSN === true) {
if (this.form.beginHostSN === "" || this.form.endHostSN === "") {
this.$message({
@@ -1502,34 +1070,16 @@ export default {
});
return;
} else {
- if (this.listQuery.productType === 1) {
- //门板
- if (
- parseInt(this.form.endHostSN) -
- parseInt(this.form.beginHostSN) <=
- 0
- ) {
- this.$message({
- message: "起止大众顺序号相减不能为零！",
- type: "error",
- });
- return;
- }
- } else if (this.listQuery.productType === 2) {
- //柱护板
- if (
- parseInt(this.form.endHostSN) -
- parseInt(this.form.beginHostSN) >
- 23
- ) {
- this.$message({
- message:
- "最多只能打印24个顺序号，终止顺序号不能大于" +
- (parseInt(this.form.beginHostSN) + 23),
- type: "error",
- });
- return;
- }
+ if (
+ parseInt(this.form.endHostSN) -
+ parseInt(this.form.beginHostSN) <=
+ 0
+ ) {
+ this.$message({
+ message: "起止大众顺序号相减不能为零！",
+ type: "error",
+ });
+ return;
}
}
}
@@ -1544,130 +1094,71 @@ export default {
}
/**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
if (
- this.formTitle === "打印-门板发货排序单" ||
+ this.formTitle === "打印-发货排序单" ||
this.formTitle === "打印-柱护板发货排序单"
) {
this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
- if (this.listQuery.productType === 1) {
- //门板-打印
- this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
- this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
- this.hostCheckQuery.productLine = this.listQuery.productLine;
- this.hostCheckQuery.GroupName = undefined
- this.isDisable = true;
- console.log(
- "检查门板-hostCheckQuery" +
- JSON.stringify(this.hostCheckQuery)
- );
- this.$axios
- .posts(
- "/api/newjit/bill-m100/check-mb-hostsn-break-num",
- this.hostCheckQuery
- )
- .then((response) => {
- console.log("检查门板-大众顺序号是否断号");
- // this.isDisable = true;
- // setTimeout(() => {
- // this.isDisable = false;
- // }, 1000);
-
- if (response.item.length > 0) {
- //有断号
- this.$confirm(
- "本次打印存在断号是否继续?" + response.item,
- "提示",
- {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }
- )
- .then(() => {
- //门板
- //传递大众顺序号起止
- this.private_printMenBan();
- })
- .catch(() => {
- this.isDisable = false;
- });
- } else {
- //无断号
- //门板
- //传递大众顺序号起止
- this.private_printMenBan();
- }
- });
- } else if (this.listQuery.productType === 2) {
- //柱护板
- this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
- this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
- this.hostCheckQuery.productLine = this.listQuery.productLine;
- this.hostCheckQuery.GroupName = this.listQuery.GroupName
- this.isDisable = true;
- this.$axios
- .posts(
- "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
- this.hostCheckQuery
- )
- .then((response) => {
- console.log("检查门板-大众顺序号是否断号");
- // this.isDisable = true;
- // setTimeout(() => {
- // this.isDisable = false;
- // }, 1000);
- if (response.item.length > 0) {
- //有断号
- this.$confirm(
- "本次打印存在断号是否继续?" + response.item,
- "提示",
- {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }
- )
- .then(() => {
- //门板
- //传递大众顺序号起止
- this.private_printZhuHuBan(true);
- })
- .catch(() => {
- this.isDisable = false;
- });
- } else {
- //无断号
- //门板
- //传递大众顺序号起止
- this.private_printZhuHuBan(true);
- }
- });
- //柱护板
-
+ //打印
+ this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
+ this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
+ this.hostCheckQuery.productLine = this.listQuery.productLine;
+ this.hostCheckQuery.GroupName = undefined
+ this.isDisable = true;
+ console.log(
+ "检查-hostCheckQuery" +
+ JSON.stringify(this.hostCheckQuery)
+ );
+ this.$axios
+ .posts(
+ "/api/newjit/bill-m100/check-mb-hostsn-break-num",
+ this.hostCheckQuery
+ )
+ .then((response) => {
+ console.log("检查-大众顺序号是否断号");
+ // this.isDisable = true;
+ // setTimeout(() => {
+ // this.isDisable = false;
+ // }, 1000);
- }
+ if (response.item.length > 0) {
+ //有断号
+ this.$confirm(
+ "本次打印存在断号是否继续?" + response.item,
+ "提示",
+ {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }
+ )
+ .then(() => {
+ //传递大众顺序号起止
+ this.private_printMenBan();
+ })
+ .catch(() => {
+ this.isDisable = false;
+ });
+ } else {
+ //无断号
+ //传递大众顺序号起止
+ this.private_printMenBan();
+ }
+ });
} else {
/**接口1获取打印数据，接口2获得grid++模板的base64编码 */
this.hostPrintQuery.beginVin = this.form.beginVin;
this.hostPrintQuery.endVin = this.form.endVin;
- //判断productType类型
- if (this.listQuery.productType === 1) {
- //门板
- //传递底盘号起止
- this.private_printMenBan();
- } else if (this.listQuery.productType === 2) {
- //柱护板
- //传递底盘号起止
- this.private_printZhuHuBan(true);
- }
+ //传递底盘号起止
+ this.private_printMenBan();
}
}
});
},
/**
- * 保存、加载、打印门板
+ * 保存、加载、打印
*/
private_printMenBan()
{
@@ -1677,7 +1168,7 @@ export default {
this.hostPrintQuery
)
.then((response) => {
- console.log("保存门板报表");
+ console.log("保存报表");
if (response.status === false) {
this.$message({
message: response.message,
@@ -1693,7 +1184,7 @@ export default {
loadInput
)
.then((response) => {
- console.log("加载门板报表");
+ console.log("加载报表");
if (response.status === false) {
this.$message({
message: response.message,
@@ -1735,7 +1226,7 @@ export default {
*/
private_printZhuHuBan(isSelAll = true)
{
- //门板 /api/newjit/bill-m100/save-zhuhuban-report
+ // /api/newjit/bill-m100/save-zhuhuban-report
//传递大众顺序号起止
this.$axios
.posts(
@@ -1755,7 +1246,6 @@ export default {
loadInput.dataResultType = (isSelAll == true) ? "1" : "2";
loadInput.reportIdList = response.item;
//--------------------------------------
- //门板
//传递大众顺序号起止
this.$axios
.posts(
@@ -1811,9 +1301,7 @@ export default {
.gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => {
this.PLList = response.item;
- this.PLChildList = this.PLList.filter(
- (u) => u.productType === parseInt(this.listQuery.productType)
- ).sort((a, b) => {
+ this.PLChildList = this.PLList.sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
@@ -1831,37 +1319,37 @@ export default {
.catch(() => {});
},
//产线类型变更
- ptypeselectChange() {
- this.$forceUpdate();
- this.PLChildList = this.PLList.filter(
- (u) => u.productType === parseInt(this.listQuery.productType)
- ).sort((a, b) => {
- return a.productLineCode - b.productLineCode;
- });
- this.listQuery.productLine = this.PLChildList[0].productLineCode;
- this.listQuery.GroupName = this.listQuery.productType == '1' ? undefined : this.PLChildGroupList[0]
- this.changeMainTableHeight()
- this.valueselectChange()
- //变更打印按钮文字
- if (this.listQuery.productType === 1) {
- this.$refs.btn1.$el.innerText = "打印门板发货排序单";
- this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
- this.$refs.btn3.$el.innerText = "补打门板发货排序单";
- this.listQuery.state.push(this.billState[0].id);
- this.isShowState = true;
- } else if (this.listQuery.productType === 2) {
- this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
- this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
- this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
- this.listQuery.state = [];
- this.isShowState = false;
- }
- if (this.listQuery.productType === 2) {
- this.listQueryList.ZHBBillStatus = 2;
- } else {
- this.listQueryList.ZHBBillStatus = 0;
- }
- },
+ // ptypeselectChange() {
+ // this.$forceUpdate();
+ // // this.PLChildList = this.PLList.filter(
+ // // (u) => u.productType === parseInt(this.listQuery.productType)
+ // // ).sort((a, b) => {
+ // // return a.productLineCode - b.productLineCode;
+ // // });
+ // this.listQuery.productLine = this.PLChildList[0].productLineCode;
+ // this.listQuery.GroupName = this.listQuery.productType == '1' ? undefined : this.PLChildGroupList[0]
+ // this.changeMainTableHeight()
+ // this.valueselectChange()
+ // //变更打印按钮文字
+ // // if (this.listQuery.productType === 1) {
+ // this.$refs.btn1.$el.innerText = "打印门板发货排序单";
+ // this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
+ // this.$refs.btn3.$el.innerText = "补打门板发货排序单";
+ // this.listQuery.state.push(this.billState[0].id);
+ // this.isShowState = true;
+ // // } else if (this.listQuery.productType === 2) {
+ // // this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
+ // // this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
+ // // this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
+ // // this.listQuery.state = [];
+ // // this.isShowState = false;
+ // // }
+ // // if (this.listQuery.productType === 2) {
+ // // this.listQueryList.ZHBBillStatus = 2;
+ // // } else {
+ // this.listQueryList.ZHBBillStatus = 0;
+ // // }
+ // },
/*单据状态变更 */
checkedListChange(index) {
if (this.listQuery.state.length <= 1) {
@@ -1988,6 +1476,12 @@ export default {
padding: 10px;
line-height: 20px;
}
+::v-deep .el-table.m100MainTable tr td{
+ background-color:#e7fff0
+}
+::v-deep .el-table .isM110DataRow td{
+ background-color:#fbc4c4 !important
+}
diff --git a/vue/src/views/pg-fis/basedate/r100Online/index copy.vue b/vue/src/views/pg-fis/basedate/r100Online/index copy.vue
new file mode 100644
index 0000000..7c5c173
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/r100Online/index copy.vue
@@ -0,0 +1,829 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.knr
+ }}
+
+
+
+
+ {{ scope.column.label }}
+
+
+
+
+
+
+
@@ -9,25 +9,7 @@
v-show="showSearch"
:inline="true"
>
-
-
-
-
-
-
-
+
{
//console.log(response);
this.PLList = response.item;
- this.PLChildList = this.PLList.filter(
- (u) => u.productType === parseInt(this.listQuery.productType)
- ).sort((a, b) => {
+ this.PLChildList = this.PLList.sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
@@ -777,18 +752,6 @@ export default {
})
.catch(() => {});
},
- //产线类型变更
- ptypeselectChange() {
- this.$forceUpdate();
- //console.log(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)
- },
/*单据状态变更 */
checkedListChange(index) {
if (this.listQuery.state.length <= 1) {
diff --git a/vue/src/views/pg-fis/basedate/repeatR100/index copy.vue b/vue/src/views/pg-fis/basedate/repeatR100/index copy.vue
new file mode 100644
index 0000000..a5bd6b2
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/repeatR100/index copy.vue
@@ -0,0 +1,941 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.vin
+ }}
+
+
+
+
+ {{ scope.column.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -9,10 +9,6 @@
v-show="showSearch"
:inline="true"
>
-
-
-
-
-
-
-
-
+
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) {
@@ -843,9 +802,7 @@ this.$axios
//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) => {
+ this.PLChildList = this.PLList.sort((a, b) => {
return a.productLineCode - b.productLineCode;
});
console.log("2222222获取产线数据："+JSON.stringify(this.PLChildList));
@@ -872,24 +829,14 @@ this.$axios
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,
- },
- ];
- }
+ //把产线值传到子组件
+ this.customerInfosMB = [
+ {
+ PrintType: 1,
+ ProductLine: val,
+ },
+ ];
+
},
handleSelectionChange(val) {
diff --git a/vue/src/views/pg-fis/basedate/select/detailMB.vue b/vue/src/views/pg-fis/basedate/select/detailMB.vue
index 490cb21..81faf3d 100644
--- a/vue/src/views/pg-fis/basedate/select/detailMB.vue
+++ b/vue/src/views/pg-fis/basedate/select/detailMB.vue
@@ -170,7 +170,7 @@
>
{
@@ -586,7 +585,7 @@ export default {
} else if (response.status === true) {
this.fileQuery.dataname = JSON.stringify(response.item);
console.log(
- "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+ "调用Handlers/Handler1.ashx?report=menban传的值：" +
JSON.stringify(this.fileQuery.dataname)
);
this.$axios
@@ -602,7 +601,7 @@ export default {
.catch(() => {});
}
},
- //作废操作，支持批量操作-门板
+ //作废操作，支持批量操作
handleDelete(row) {
//批量删除
var params = [];
@@ -700,7 +699,6 @@ export default {
roleFilter(type) {
return projectTypeKeyValue[type];
},
- //门板
handleFilter() {
this.page = 1;
this.getList();
diff --git a/vue/src/views/pg-fis/basedate/select/index copy.vue b/vue/src/views/pg-fis/basedate/select/index copy.vue
new file mode 100644
index 0000000..603f8b2
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/select/index copy.vue
@@ -0,0 +1,1690 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.vin
+ }}
+
+
+
+
+ {{ scope.column.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7,33 +7,14 @@
:model="listQuery"
ref="queryForm"
v-show="showSearch"
- :inline="true"
- >
-
-
-
-
-
-
+ :inline="true">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
导出(Excel)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-