Compare commits

...

15 Commits

  1. 18
      vue/src/components/ImportTxt/index.vue
  2. 13
      vue/src/router/index.js
  3. 3
      vue/src/settings.js
  4. 11
      vue/src/views/login/index.vue
  5. 11
      vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
  6. 29
      vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
  7. 4
      vue/src/views/pg-fis/basedate/m100BIll/detail.vue
  8. 23
      vue/src/views/pg-fis/basedate/m100BIll/index.vue
  9. 12
      vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
  10. 11
      vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
  11. 13
      vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
  12. 5
      vue/src/views/pg-fis/basedate/m100Online/detail.vue
  13. 3
      vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
  14. 4
      vue/src/views/pg-fis/basedate/m100Online/index-old.vue
  15. 4
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  16. 308
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  17. 4
      vue/src/views/pg-fis/basedate/r100Online/detail.vue
  18. 1
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  19. 4
      vue/src/views/pg-fis/basedate/select/detail.vue
  20. 3
      vue/src/views/pg-fis/basedate/select/detailZHB.vue
  21. 23
      vue/src/views/pg-fis/basedate/select/index.vue
  22. 18
      vue/static/config.js

18
vue/src/components/ImportTxt/index.vue

@ -346,6 +346,7 @@ export default {
fis: "FIS发运数据",
settleAccount: "R3数据",
AssemblyCfgERP:"总成SAP数据",
PartCfg:"物料数据",
}[this.crmType] || ""
);
},
@ -355,6 +356,7 @@ export default {
fis: "/api/settleaccount/fis/ExcelImport",
settleAccount: "/api/settleaccount/SettleAccount/ExcelImport",
AssemblyCfgERP:"/api/newjit/assembly-cfg-erp/import",
PartCfg:"/api/newjit/part-cfg/import",
}[this.crmType] || ""
);
},
@ -365,6 +367,7 @@ export default {
fis: "FIS发运数据导入模板.xlsx",
settleAccount: "R3数据模板.xlsx",
AssemblyCfgERP:"BOM-批量导入模板.txt",
PartCfg:"BOM-批量导入模板.txt",
}[this.crmType] || ""
);
},
@ -474,12 +477,13 @@ export default {
beforeAvatarUpload(file) {
var FileExt = file.name.replace(/.+\./, "");
if (["txt"].indexOf(FileExt.toLowerCase()) === -1) {
this.$message({
type: "warning",
message: "只支持txt文本类型文件!",
});
this.isFileType = "0";
return false;
// this.$message({
// type: "warning",
// message: "txt",
// });
// this.isFileType = "0";
// return false;
this.isFileType = "1";
} else {
this.isFileType = "1";
}
@ -563,7 +567,7 @@ export default {
.posts(webapi, fd)
.then(async (res) => {
console.log("导入条件:" + JSON.stringify(res));
if(this.crmType !== "AssemblyCfgERP"){
if(this.crmType !== "AssemblyCfgERP" && this.crmType !== "PartCfg"){
if (res === "Success") {
if (this.isLt2M === "1" && this.isFileType === "1") {
this.$notify({

13
vue/src/router/index.js

@ -64,11 +64,16 @@ export const constantRoutes = [
},
{
path: '/login',
//component: () => import('@/views/login/index'),
component: () => import('@/views/login/index'),
//component: () => import('@/views/pg-fis/basedate/customerPartCfg'),
//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
hidden: true
//component: () => import('@/views/pg-fis/basedate/unknownAssembly'), //?? one
// component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
//component: () => import('@/views/pg-fis/basedate/select'), //M100查询
//component: () => import('@/views/pg-fis/basedate/m100BIll'), //M100单据信息维护
//component: () => import('@/views/pg-fis/basedate/r100Online'), //R100上线信息
//component: () => import('@/views/pg-fis/basedate/customerPartCfg'), //客户零件管理
},
{
path: '/auth-redirect',
@ -188,7 +193,7 @@ export const asyncRoutes = [
//wheeldataRouter,//大众看板和备件
pgfisPrint,//排序单打印
pgfis,//派格fis
JobTimeDataRouter,//后台作业监控
//JobTimeDataRouter,//后台作业监控
// 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true }

3
vue/src/settings.js

@ -1,5 +1,6 @@
module.exports = {
title: '长春派格汽车塑料技术有限公司结算管理系统',
// title: '长春派格汽车塑料技术有限公司结算管理系统',
title: '佛山FIS排序单打印系统',
/**
* @type {boolean} true | false

11
vue/src/views/login/index.vue

@ -2,7 +2,11 @@
<div class="wrapper">
<div class="left">
<div class="container"><span class="one">SAS/JIT-长春派格汽车塑料技术有限公司结算管理系统</span><span class="two"></span></div>
<div class="container">
<!-- <span class="one">SAS/JIT-长春派格汽车塑料技术有限公司结算管理系统</span> -->
<span class="one">佛山FIS排序单打印系统</span>
<span class="two"></span>
</div>
<!-- <div class="container"><span class="one">闻荫科技-长春派格结算管理系统</span><span class="two"></span></div> -->
@ -10,9 +14,8 @@
<div class="">
<div class="copyright">
长春市闻荫科技
<a
target="_blank"
href="http://www.ccwin-in.com">©2021 闻荫科技-长春派格结算管理系统</a>
<!-- <a target="_blank" href="http://www.ccwin-in.com">©2021 闻荫科技-长春派格结算管理系统</a> -->
<a target="_blank" href="http://www.ccwin-in.com">©2021 闻荫科技-佛山FIS排序单打印系统</a>
</div>
</div>
</div>

11
vue/src/views/pg-fis/basedate/assemblyCfg/index.vue

@ -46,7 +46,7 @@
</el-button>
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-delete" @click="handleDelete" disabled>删除
</el-button>
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" disabled>导入SAP对接
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" >导入SAP对接
</el-button>
</el-form-item>
</el-form>
@ -182,7 +182,7 @@
<pagination v-show="totalCount > 0" :total="totalCount" :page.sync="page" :limit.sync="listQuery.maxResultCount"
@pagination="getList" />
<!-- 导入Excel组件 -->
<importExcel ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="importExcelData" />
<importExcelCtrl ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="onImportExcelDlgClosed" />
</div>
<!-- 抽屉控件 -->
<el-drawer title="信息详细页" size="75%" direction="rtl" :visible.sync="drawer" :before-close="handleDrawerClose">
@ -197,7 +197,8 @@
import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportTxt";
import importExcelCtrl from "@/components/ImportTxt";
//import importExcelCtrl from "@/components/ImportExcel";
import Lockr from "lockr";
import moment from "moment";
import Detail from "./detail.vue";
@ -229,7 +230,7 @@
components: {
Pagination,
CRMTableHead,
importExcel,
importExcelCtrl,
Detail
},
directives: {
@ -565,7 +566,7 @@
selectOptionsChange(item) {
this.getList();
},
importExcelData() {
onImportExcelDlgClosed() {
//
this.listLoading = false;
this.showExcelImport = false;

29
vue/src/views/pg-fis/basedate/customerPartCfg/index.vue

@ -116,6 +116,11 @@
@click="handleDownload()"
>导出Excel
</el-button>
</el-form-item>
<el-form-item>
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" >导入零件
</el-button>
</el-form-item>
<!--表格头组件filter查询-->
<!-- <c-r-m-table-head
@ -188,12 +193,7 @@
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
<importExcelCtrl ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="onImportExcelDlgClosed" />
</div>
</div>
</template>
@ -201,7 +201,8 @@
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import importExcel from "@/components/ImportExcel-invoice";
//import importExcelCtrl from "@/components/ImportExcel-invoice";
import importExcelCtrl from "@/components/ImportTxt";
import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment";
import Lockr from "lockr";
@ -210,7 +211,7 @@ import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
export default {
name: "CustomerPartCfg",
components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
components: { Pagination, CRMTableHead, importExcelCtrl, XhJSSelect },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
@ -310,6 +311,7 @@ export default {
formTitle: "",
drawer: false,
showExcelImport: false,
crmType: "PartCfg",
tableHeight: document.documentElement.clientHeight - 260,
isEdit: false,
sortState:false, //
@ -481,11 +483,11 @@ export default {
}
return row[column.property] || "--";
},
importExcelData() {
//this.getVersionInfo();
this.listLoading = false;
onImportExcelDlgClosed() {
//
this.listLoading = false;
this.showExcelImport = false;
this.getList();
},
//
async handleDownload() {
@ -753,7 +755,12 @@ export default {
.catch(() => {
});
},
handleImportSAP() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
}, //method
};
</script>

4
vue/src/views/pg-fis/basedate/m100BIll/detail.vue

@ -148,6 +148,7 @@ export default {
searchContent: "", //
customerInfo: {
parentId: "",
billId: ""
},
form: {
dicDetailID: "",
@ -206,6 +207,7 @@ export default {
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
this.customerInfo.billId = element.BillId;
});
if (this.customerInfo.parentId != "") {
this.getList();
@ -270,7 +272,7 @@ export default {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
//alert("" + JSON.stringify(this.customerInfo.parentId));
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId, billId: this.customerInfo.billId };
this.$axios
.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
.then((response) => {

23
vue/src/views/pg-fis/basedate/m100BIll/index.vue

@ -43,6 +43,23 @@
</el-select>
</el-form-item>
<el-form-item label="大众工位" prop="fwStation" v-show="listQuery.productType == 2">
<el-select
v-model="listQuery.fwStation"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
>
<el-option
v-for="item in fwStationList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="版本:" prop="Version">
<el-input
v-model="listQuery.Version"
@ -638,6 +655,7 @@ export default {
SkipCount: 0,
MaxResultCount: 15,
productType: 1,
fwStation : "BA2", //
ProductLine: undefined,
version:undefined,
HostSNBegin:undefined,
@ -726,6 +744,10 @@ export default {
},
vehicleModelList:[],//list
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
fwStationList: [
{ id: "BA2", name: "BA2" },
{ id: "BA5", name: "BA5" }
],
gettime:"",
KNRlist:null,
};
@ -810,6 +832,7 @@ export default {
this.customerInfos = [
{
ParentId: parentId,
BillId: param.id
},
];
},

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

@ -99,6 +99,7 @@
type="success"
icon="el-icon-s-shop"
@click="handleUpdate()"
style="visibility: collapse;"
>打印当前页</el-button
>
<el-button
@ -252,6 +253,7 @@ export default {
printType: "1",
productLine: "",
partType: "",
fwStation: ""
},
//
filterObj: {
@ -337,6 +339,7 @@ export default {
newVal.forEach((element) => {
this.customerInfo.printType = "1";
this.customerInfo.productLine = element.ProductLine;
this.customerInfo.fwStation = element.fwStation;
});
console.log("柱护板监控传值:" + JSON.stringify(this.customerInfo));
if (this.customerInfo.productLine != "") {
@ -488,6 +491,10 @@ export default {
if (this.customerInfo.productLine != "") {
this.listQuery.ProductLine = this.customerInfo.productLine;
}
if (this.customerInfo.fwStation != "") {
this.listQuery.fwStation = this.customerInfo.fwStation;
}
console.log("柱护板-列表查询条件:" + JSON.stringify(this.listQuery));
this.$axios
@ -533,6 +540,7 @@ export default {
var params = {
printType: "1",
productLine: this.customerInfo.productLine,
fwStation: this.customerInfo.fwStation,
reportIdList: ZHBId,
partType: this.multipleSelection[0].partType,
dataResultType: "2",
@ -615,11 +623,13 @@ export default {
var params = {
printType: "1",
productLine: this.customerInfo.productLine,
fwStation: this.customerInfo.fwStation,
reportIdList: ZHBId,
//partType: this.multipleSelection[0].partType,
dataResultType: "1",
};
console.log("柱护版-主界面传过来的值:" + JSON.stringify(params));
let _this = this;
this.$axios
//.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.posts("/api/newjit/bill-m100/load-zhuhuban-report", params)
@ -640,7 +650,7 @@ export default {
);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban",
"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {

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

@ -312,6 +312,7 @@ export default {
customerInfo: {
printType: "1",
productLine: "",
fwStation: ""
},
//
filterObj: {
@ -401,6 +402,7 @@ export default {
newVal.forEach((element) => {
this.customerInfo.printType = "1";
this.customerInfo.productLine = element.ProductLine;
this.customerInfo.fwStation = element.fwStation;
});
console.log("柱护板监控传值:" + JSON.stringify(this.customerInfo));
if (this.customerInfo.productLine != "") {
@ -415,7 +417,7 @@ export default {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
//tempsTabs.push({ label: "", prop: "billSerialNum", width: 120 });
tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
tempsTabs.push({
@ -552,6 +554,9 @@ export default {
if (this.customerInfo.productLine != "") {
this.listQuery.ProductLine = this.customerInfo.productLine;
}
if (this.customerInfo.fwStation != "") {
this.listQuery.fwStation = this.customerInfo.fwStation;
}
console.log("柱护板-列表查询条件:" + JSON.stringify(this.listQuery));
this.$axios
@ -597,10 +602,12 @@ export default {
var params = {
printType: "1",
productLine: this.customerInfo.productLine,
fwStation: this.customerInfo.fwStation,
beginVin: beginVin1,
endVin: endVin1,
};
console.log("柱护版-主界面传过来的值:" + JSON.stringify(params));
let _this = this;
this.$axios
.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.then((response) => {
@ -620,7 +627,7 @@ export default {
);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban",
"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {

13
vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue

@ -218,6 +218,7 @@ export default {
customerInfo: {
printType: "",
productLine: "",
fwStation: ""
},
//
filterObj: {
@ -306,6 +307,7 @@ export default {
newVal.forEach((element) => {
this.customerInfo.printType = 2; //2
this.customerInfo.productLine = element.ProductLine;
this.customerInfo.fwStation = element.fwStation;
});
if (this.customerInfo.productLine != "") {
this.getList();
@ -474,6 +476,9 @@ export default {
if (this.customerInfo.productLine != "") {
inputParam.productLine = this.customerInfo.productLine;
}
if (this.customerInfo.fwStation != "") {
inputParam.fwStation = this.customerInfo.fwStation;
}
console.log('取柱护板补打列表replenish-print-zhb-list方法输入参数:' + JSON.stringify(this.listQuery));
this.$axios
@ -510,6 +515,7 @@ export default {
var params = {
printType: 2,
productLine: this.customerInfo.productLine,
fwStation: this.customerInfo.fwStation,
beginVin: beginVin1,
endVin: endVin1,
m100IdList: []
@ -539,7 +545,7 @@ export default {
// this.$axios
// .posts(
// "/Handlers/Handler1.ashx?report=zhuhuban",
// "/Handlers/Handler1.ashx?report=zhuhuban_" + this.customerInfo.productLine + '-' + this.customerInfo.fwStation,
// qs.stringify(this.fileQuery)
// )
// .then((response) => {
@ -561,6 +567,7 @@ export default {
debugger
//
//
let _this = this;
this.$axios
.posts(
"/api/newjit/bill-m100/save-zhuhuban-report",
@ -605,12 +612,14 @@ export default {
this.fileQuery.dataname = JSON.stringify(
response.item
);
//this.fileQuery.dataname = "";
console.log("打印json");
console.log(this.fileQuery.dataname);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban",
//"/Handlers/Handler1.ashx?report=zhuhuban",
"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {

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

@ -148,6 +148,7 @@ export default {
searchContent: "", //
customerInfo: {
parentId: "",
billId: ""
},
form: {
dicDetailID: "",
@ -201,11 +202,13 @@ export default {
watch: {
customerInfos: {
handler(newVal) {
debugger
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
this.customerInfo.billId = element.BillId;
});
if (this.customerInfo.parentId != "") {
this.getList();
@ -270,7 +273,7 @@ export default {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
//alert("" + JSON.stringify(this.customerInfo.parentId));
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId, billId: this.customerInfo.billId };
this.$axios
.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
.then((response) => {

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

@ -553,6 +553,7 @@ export default {
endVin: endVin1,
};
console.log("柱护版-主界面传过来的值:" + JSON.stringify(params));
let _this = this;
this.$axios
.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.then((response) => {
@ -572,7 +573,7 @@ export default {
);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban",
"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {

4
vue/src/views/pg-fis/basedate/m100Online/index-old.vue

@ -702,6 +702,7 @@ export default {
this.customerInfos = [
{
ParentId: parentId,
BillId: param.id
},
];
},
@ -1249,6 +1250,7 @@ export default {
} else if (this.listQuery.productType === 2) {
//
//
let _this = this;
this.$axios
.posts(
"/api/newjit/bill-m100/print-zhuhuban-packing-list",
@ -1274,7 +1276,7 @@ export default {
console.log(this.fileQuery.dataname);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban",
"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {

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

@ -737,6 +737,7 @@ export default {
this.customerInfos = [
{
ParentId: parentId,
BillId: param.id
},
];
},
@ -1290,6 +1291,7 @@ export default {
} else if (this.listQuery.productType === 2) {
//
//
let _this = this;
this.$axios
.posts(
"/api/newjit/bill-m100/print-zhuhuban-packing-list",
@ -1315,7 +1317,7 @@ export default {
console.log(this.fileQuery.dataname);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban",
"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {

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

@ -1,4 +1,5 @@
<!--日常打印M100信息模块-->
<!--日常打印M100信息模块-->
<template>
<div class="cr-body-content">
<div ref="box">
@ -45,6 +46,24 @@
</el-select>
</el-form-item>
<el-form-item label="大众工位" prop="fwStation" v-show="this.listQuery.productType === 2">
<el-select
v-model="listQuery.fwStation"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="fwStation_selectChange"
>
<el-option
v-for="item in fwStationList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@ -76,8 +95,9 @@
@click="print()"
>打印门板发货排序单
</el-button>
<el-button
v-show="this.listQuery.productType === 1"
v-show="false"
@click="drawerMBPrint = true"
size="mini"
type="warning"
@ -86,7 +106,7 @@
<strong>重新打印门板</strong></el-button
>
<el-button
v-show="this.listQuery.productType === 1"
v-show="false"
@click="drawerbudaMBPrint = true"
size="mini"
type="warning"
@ -95,7 +115,7 @@
<strong>门板补打</strong></el-button
>
<el-button
v-show="this.listQuery.productType === 1"
v-show="false"
@click="drawerMBDelete = true"
size="mini"
type="danger"
@ -224,7 +244,7 @@
<ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
</el-drawer>
<div class="l-table" style="margin-top: -10px">
<div class="l-table" style="margin-top: -15px">
<!--表格渲染-->
<el-table
ref="multipleTable"
@ -365,7 +385,7 @@
clearable
:disabled="true"
size="small"
style="width: 240px"
style="width: 240px;"
/>
</el-form-item>
</el-col>
@ -414,7 +434,7 @@
<pagination
v-show="totalCount > 0"
:total="totalCount"
style="margin-bottom: -5px; float: right"
style="float: right"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
@ -557,6 +577,7 @@ export default {
SkipCount: 0,
MaxResultCount: 15,
productType: 1, //1:2:
fwStation : "BA2", //
ProductLine: undefined,
Version: undefined,
printBillNum: undefined,
@ -643,19 +664,17 @@ export default {
{ id: 1, name: "门板" },
{ id: 2, name: "柱护板" },
],
fwStationList: [
{ id: "BA2", name: "BA2" },
{ id: "BA5", name: "BA5" }
],
isShowHostSN: false,
isShowVin: false,
isShowState: true,
};
},
mounted() {
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 67 - 79; //57footer79
//this.tableHeight = offsetHei -260
});
this.setTableHeight()
let timer = setInterval(() => {
this.open();
@ -741,6 +760,15 @@ export default {
...mapGetters(["userInfo"]), //
},
methods: {
setTableHeight(){
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 67 - 79 - 10; //57footer79
//this.tableHeight = offsetHei -260
});
},
opens() {
this.getList();
@ -789,13 +817,13 @@ export default {
if (JKITEM.productLine == "01") {
this.$refs.sp01.Visible = true;
this.content01 =
"01生产线已经" +
"大众一厂已经" +
JKITEM.timeoutMinutes +
"分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//
console.log(
"222222222222222222222222222222222222222222222222"
"222222222222222222222222222222222222222222222222-1"
);
this.$refs.sp01.style.color = "red";
this.$refs.sp01.style.fontWeight = "bold";
@ -803,58 +831,76 @@ export default {
this.$refs.sp01.style.color = "green";
}
}
if (JKITEM.productLine == "05") {
if (JKITEM.productLine == "02") {
this.$refs.sp05.Visible = true;
this.content05 =
"05生产线已经" +
"大众二厂已经" +
JKITEM.timeoutMinutes +
"分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//
console.log(
"222222222222222222222222222222222222222222222222"
"222222222222222222222222222222222222222222222222-2"
);
this.setTableHeight()
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) {
//
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.$refs.sp08.Visible = true;
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";
}
}
// if (JKITEM.productLine == "05") {
// this.$refs.sp05.Visible = true;
// this.content05 =
// "05线" +
// JKITEM.timeoutMinutes +
// "\xa0\xa0\xa0\xa0";
// 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.$refs.sp07.Visible = true;
// this.content07 =
// "07线" +
// JKITEM.timeoutMinutes +
// "\xa0\xa0\xa0\xa0";
// 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.$refs.sp08.Visible = true;
// 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({
@ -979,6 +1025,7 @@ export default {
},
//
handleDrawerOpen(param) {
debugger
this.drawer = true;
//console.log(510)
//console.log(param)
@ -986,9 +1033,11 @@ export default {
this.customerInfos = [
{
ParentId: parentId,
BillId: param.id
},
];
},
handleDrawerClose(done) {
done();
},
@ -1119,6 +1168,7 @@ export default {
return projectTypeKeyValue[type];
},
getList(data) {
this.listLoading = true;
if (data != undefined) {
this.listQueryList.SkipCount = (this.page - 1) * data.limit;
@ -1138,6 +1188,7 @@ export default {
this.listQueryList.BillStatus = 2; //
this.listQueryList.ProductLine = this.listQuery.productLine; //线
this.listQueryList.CanNotPrint = false; //
this.listQueryList.fwStation = this.listQuery.fwStation; //BA2 BA5
console.log(
"日常打印M100查询条件:" + JSON.stringify(this.listQueryList)
);
@ -1194,6 +1245,7 @@ export default {
{
PrintType: 1,
ProductLine: val,
fwStation: this.listQuery.fwStation
},
];
}
@ -1203,10 +1255,36 @@ export default {
{
PrintType: 1,
ProductLine: val,
fwStation: this.listQuery.fwStation
},
];
}
},
fwStation_selectChange(val) {
this.$forceUpdate();
if (this.listQuery.productType === 1) {
//线
this.customerInfosMB = [
{
PrintType: 1,
ProductLine: this.listQuery.productLine,
fwStation: val
},
];
}
if (this.listQuery.productType === 2) {
//线
this.customerInfosZHB = [
{
PrintType: 1,
ProductLine: this.listQuery.productLine,
fwStation: val
}
];
}
},
handleImportSAP() {},
handleFilter() {
@ -1260,6 +1338,7 @@ export default {
(this.hostCheckQuery.printType = 0);
this.hostPrintQuery.printType = 0;
this.vinPrintQuery.printType = 0;
if (
this.listQuery.productLine === "" ||
this.listQuery.productLine === undefined
@ -1272,8 +1351,13 @@ export default {
}
(this.printNum = "12"),
(this.printNumZHB = "24"),
(this.hostSNQuery.productLine = this.listQuery.productLine);
this.hostSNQuery.productLine = this.listQuery.productLine;
this.hostSNQuery.fwStation = this.listQuery.fwStation
this.hostPrintQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.fwStation = this.listQuery.fwStation;
//
if (this.listQuery.productType === 1) {
//
@ -1281,16 +1365,17 @@ export default {
console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
this.$axios
.gets(
"/api/newjit/bill-m100/get-print-start-hostsn2",
"/api/newjit/bill-m100/get-print-start-hostsn3",
this.hostSNQuery
)
.then((response) => {
console.log("获取hostsn大众顺序号起始");
console.log(response.item);
if (response.item !== null) {
this.form.beginHostSN = parseInt(response.item);
this.form.beginHostSN = parseInt(response.item.beginHostSN);
this.printNum = parseInt(response.item.count);
if (this.listQuery.productType === 1) {
this.form.endHostSN = parseInt(response.item) + 11;
this.form.endHostSN = parseInt(response.item.beginHostSN) + parseInt(response.item.count) - 1;
} else if (this.listQuery.productType === 2) {
//
this.form.endHostSN = parseInt(response.item) + 23;
@ -1308,6 +1393,31 @@ export default {
this.hostSNQuery.isZhuHuBan = "1";
console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
// get-zhuhuban-vin-num this.printNumZHB---------------------------------
this.$axios
.gets(
"/api/newjit/bill-m100/get-zhuhuban-vin-num",
this.hostSNQuery
)
.then((response) => {
console.log("获取柱护板打印数量");
console.log(response.item);
if (response.item !== null) {
this.printNumZHB = parseInt(response.item);
//this.form.endHostSN = this.form.beginHostSN + this.printNumZHB - 1;
this.form.endHostSN = parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
} else {
this.$message({
message: "获取柱护板打印数量失败,返回空",
type: "warning",
});
return;
}
});
//---------------------------------------------------------------------------------------
this.$axios
.gets(
"/api/newjit/bill-m100/get-print-start-hostsn2",
@ -1323,7 +1433,8 @@ export default {
this.form.endHostSN = parseInt(response.item) + 11;
} else if (this.listQuery.productType === 2) {
//
this.form.endHostSN = parseInt(response.item) + 23;
//this.form.endHostSN = parseInt(response.item) + 23;
this.form.endHostSN = parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
}
} else {
this.$message({
@ -1337,17 +1448,8 @@ export default {
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";
case "00":
this.productName = "全部门板";
break;
}
@ -1355,8 +1457,11 @@ export default {
} else {
this.productName = "";
switch (this.listQuery.productLine) {
case "08":
this.productName = "总装-柱护板";
case "01":
this.productName = "大众一厂";
break;
case "02":
this.productName = "大众二厂";
break;
}
this.formTitle = "打印-柱护板发货排序单";
@ -1395,6 +1500,7 @@ export default {
}
this.formTitle = "重打";
this.hostPrintQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.fwStation = this.listQuery.fwStation;
this.dialogFormVisible = true;
this.form = {
beginVin: "",
@ -1428,6 +1534,7 @@ export default {
}
this.formTitle = "补打";
this.hostPrintQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.fwStation = this.listQuery.fwStation;
this.dialogFormVisible = true;
this.form = {
beginVin: "",
@ -1438,11 +1545,10 @@ export default {
},
save() {
this.$refs.form.validate((valid) => {
if (valid) {
//this.listLoaddingPrint = true;
if (this.isShowHostSN === true) {
if (this.form.beginHostSN === "" || this.form.endHostSN === "") {
if (this.form.beginHostSN === "") { // || this.form.endHostSN === ""
this.$message({
message: "请输入完整的顺序号起始范围",
type: "error",
@ -1453,8 +1559,7 @@ export default {
//
if (
parseInt(this.form.endHostSN) -
parseInt(this.form.beginHostSN) <=
0
parseInt(this.form.beginHostSN) < 0
) {
this.$message({
message: "起止大众顺序号相减不能为零!",
@ -1464,19 +1569,19 @@ export default {
}
} 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) >
// 23
// ) {
// this.$message({
// message:
// "24" +
// (parseInt(this.form.beginHostSN) + 23),
// type: "error",
// });
// return;
// }
}
}
}
@ -1498,7 +1603,7 @@ export default {
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;
@ -1550,6 +1655,7 @@ export default {
this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
this.hostCheckQuery.productLine = this.listQuery.productLine;
this.hostCheckQuery.fwStation = this.listQuery.fwStation;
this.isDisable = true;
this.$axios
.posts(
@ -1616,7 +1722,6 @@ export default {
*/
private_printMenBan()
{
debugger
this.$axios
.posts(
"/api/newjit/bill-m100/save-menban-report",
@ -1687,7 +1792,6 @@ export default {
*/
private_printZhuHuBan(isSelAll = true)
{
debugger
//
//
this.$axios
@ -1709,6 +1813,7 @@ export default {
let loadInput = {};
loadInput.dataResultType = (isSelAll == true) ? "1" : "2";
loadInput.reportIdList = response.item;
loadInput.productLine = this.hostPrintQuery.productLine
//--------------------------------------
//
//
@ -1736,9 +1841,12 @@ export default {
//this.fileQuery.dataname = "";
console.log("打印json");
console.log(this.fileQuery.dataname);
let reporturl = "/Handlers/Handler1.ashx?report=zhuhuban_" + this.hostPrintQuery.productLine + '-' + this.hostPrintQuery.fwStation; //zhuhuban_01-BA2
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban",
reporturl, //"/Handlers/Handler1.ashx?report=zhuhuban",
qs.stringify(this.fileQuery)
)
.then((response) => {
@ -1761,10 +1869,18 @@ export default {
//线
getProductLine() {
if (this.userInfo == null || this.userInfo.userId == null) //使
{
this.listPLQuery.UserId = 'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA';
}
else
{
this.listPLQuery.UserId = this.userInfo.userId;
}
console.log(
"this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" +
this.listPLQuery.UserId
"this.listPLQuery.UserId::" + this.listPLQuery.UserId
);
this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery)
@ -1802,6 +1918,7 @@ export default {
return a.productLineCode - b.productLineCode;
});
//console.log(this.PLList)
this.setTableHeight()
//
if (this.listQuery.productType === 1) {
this.$refs.btn1.$el.innerText = "打印门板发货排序单";
@ -1809,6 +1926,7 @@ export default {
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 = "重新打印柱护板发货排序单";
@ -1816,12 +1934,14 @@ export default {
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) {

4
vue/src/views/pg-fis/basedate/r100Online/detail.vue

@ -148,6 +148,7 @@ export default {
searchContent: "", //
customerInfo: {
parentId: "",
billId: ""
},
form: {
dicDetailID: "",
@ -206,6 +207,7 @@ export default {
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
this.customerInfo.billId = element.BillId;
});
if (this.customerInfo.parentId != "") {
this.getList();
@ -270,7 +272,7 @@ export default {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
//alert("" + JSON.stringify(this.customerInfo.parentId));
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId, billId: this.customerInfo.billId };
this.$axios
.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
.then((response) => {

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

@ -501,6 +501,7 @@ export default {
this.customerInfos = [
{
ParentId: parentId,
BillId: param.id
},
];
},

4
vue/src/views/pg-fis/basedate/select/detail.vue

@ -148,6 +148,7 @@ export default {
searchContent: "", //
customerInfo: {
parentId: "",
billId: ""
},
form: {
dicDetailID: "",
@ -206,6 +207,7 @@ export default {
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
this.customerInfo.billId = element.BillId;
});
if (this.customerInfo.parentId != "") {
this.getList();
@ -270,7 +272,7 @@ export default {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
//alert("" + JSON.stringify(this.customerInfo.parentId));
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId, billId: this.customerInfo.billId };
this.$axios
.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
.then((response) => {

3
vue/src/views/pg-fis/basedate/select/detailZHB.vue

@ -553,6 +553,7 @@ export default {
endVin: endVin1,
};
console.log("柱护版-主界面传过来的值:" + JSON.stringify(params));
let _this = this;
this.$axios
.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
.then((response) => {
@ -572,7 +573,7 @@ export default {
);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban",
"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {

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

@ -634,8 +634,13 @@ export default {
width: 120,
});
tempsTabs.push({
label: "柱护板状态",
prop: "printBillNum",
label: "柱护板状态BA2",
prop: "bA2",
width: 120,
});
tempsTabs.push({
label: "柱护板状态BA5",
prop: "bA5",
width: 120,
});
tempsTabs.push({
@ -672,6 +677,7 @@ export default {
this.customerInfos = [
{
ParentId: parentId,
BillId: param.id
},
];
},
@ -797,6 +803,14 @@ export default {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property === "bA2") {
return { null: "未打印", 0: "未打印", 1: "已打印" }[row[column.property]];
}
if (column.property === "bA5") {
return { null: "未打印", 0: "未打印", 1: "已打印" }[row[column.property]];
}
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];
if (date == undefined) {
@ -1199,7 +1213,7 @@ export default {
console.log("检查hostsn大众顺序号是否断号");
console.log(response);
if (response.item.length > 0) {
this.$confirm("本次打印存在断号是否继续?", "提示", {
this.$confirm("本次打印存在断号是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@ -1248,6 +1262,7 @@ export default {
} else if (this.listQuery.productType === 2) {
//
//
let _this = this;
this.$axios
.posts(
"/api/newjit/bill-m100/print-zhuhuban-packing-list",
@ -1273,7 +1288,7 @@ export default {
console.log(this.fileQuery.dataname);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban",
"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
qs.stringify(this.fileQuery)
)
.then((response) => {

18
vue/static/config.js

@ -2,11 +2,10 @@ let configJSON
if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
//ip: 'http://192.168.0.140',
ip: 'http://127.0.0.1', //?? two
auth_port: '8066',
public_port: '8092',
//backend_port: '8092',
// backend_port: '8092',
backend_port: '44344', //?? three
},
basic: {},
@ -37,15 +36,16 @@ if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
//ip: 'http://192.168.0.67',
//ip: 'http://192.168.0.140',
ip: 'http://192.168.0.63',
//ip: 'http://149.223.116.5',
//ip: 'http://114.116.225.148',
//ip: 'http://10.123.148.162',
ip: 'http://192.168.7.21',
//ip: "http://222.169.228.163",
auth_port: '8066',
public_port: '8092',
backend_port: '8092'
backend_port: '8092',
// auth_port: "7696",
// public_port: "7692",
// backend_port: "7692",
},
basic: {},

Loading…
Cancel
Save