Browse Source

【pc前端】基础完成

master
安虹睿 1 day ago
parent
commit
18e338c608
  1. 1
      vue/README.md
  2. 2
      vue/public/index.html
  3. 4
      vue/src/router/index.js
  4. 102
      vue/src/router/modules/fis.js
  5. 15
      vue/src/router/modules/fisprint.js
  6. 2
      vue/src/settings.js
  7. 6
      vue/src/views/login/index.vue
  8. 11
      vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
  9. 17
      vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
  10. 8
      vue/src/views/pg-fis/basedate/logRemind/index.vue
  11. 2
      vue/src/views/pg-fis/basedate/m100BIll/index copy.vue
  12. 46
      vue/src/views/pg-fis/basedate/m100BIll/index.vue
  13. 361
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  14. 354
      vue/src/views/pg-fis/basedate/m110Search/detail.vue
  15. 733
      vue/src/views/pg-fis/basedate/m110Search/index.vue
  16. 10
      vue/src/views/pg-fis/basedate/partSwitch/index.vue
  17. 8
      vue/src/views/pg-fis/basedate/productLine/index.vue
  18. 7
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  19. 2
      vue/src/views/pg-fis/basedate/repeatR100/index copy.vue
  20. 8
      vue/src/views/pg-fis/basedate/repeatR100/index.vue
  21. 30
      vue/src/views/pg-fis/basedate/select/index.vue
  22. 2
      vue/src/views/pg-fis/basedate/unknownAssembly/index copy.vue
  23. 16
      vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
  24. 14
      vue/src/views/pg-fis/basedate/weldingAssembly/index.vue

1
vue/README.md

@ -1,6 +1,5 @@
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
<!-- SAS/JIT-长春派格汽车塑料技术有限公司结算管理系统 -->
**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)*
- [Getting started](#getting-started)

2
vue/public/index.html

@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<script type="text/javascript" src="config.js"></script>
<title><%= webpackConfig.name %></title>
<!-- <title><%= webpackConfig.name %></title> -->
<!-- <link rel="stylesheet" href="./css/style.css" type="text/css" />-->
<!-- <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> -->

4
vue/src/router/index.js

@ -187,8 +187,8 @@ export const asyncRoutes = [
//businessdataRouter,
//wheeldataRouter,//大众看板和备件
pgfisPrint,//排序单打印
pgfis,//派格fis
JobTimeDataRouter,//后台作业监控
pgfis,
// JobTimeDataRouter,//后台作业监控
// 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true }

102
vue/src/router/modules/fis.js

@ -1,4 +1,4 @@
/** 派格fis路由 */
/** 路由 */
//import Layout from '@/layout/firstLayout'
import Layout from '@/layout'
@ -26,36 +26,36 @@ const pgfis = {
icon: '发货'
}
},
{
path: '/pg-assemblyCfg',
component: () => import('@/views/pg-fis/basedate/assemblyCfg'),
name: 'pg-assemblyCfg',//命名路由
meta: {
title: '总成模块管理',
roles: ['SettleAccount.Reports'],
icon: '发货'
}
},
{
path: '/pg-partSwitch',
component: () => import('@/views/pg-fis/basedate/partSwitch'),
name: 'pg-partSwitch',//命名路由
meta: {
title: '零件切换管理',
roles: ['SettleAccount.Reports'],
icon: '发货'
}
},
{
path: '/pg-unknownAssembly',
component: () => import('@/views/pg-fis/basedate/unknownAssembly'),
name: 'pg-unknownAssembly',//命名路由
meta: {
title: '未知总成模块管理',
roles: ['SettleAccount.Reports'],
icon: '发货'
}
},
// {
// path: '/pg-assemblyCfg',
// component: () => import('@/views/pg-fis/basedate/assemblyCfg'),
// name: 'pg-assemblyCfg',//命名路由
// meta: {
// title: '总成模块管理',
// roles: ['SettleAccount.Reports'],
// icon: '发货'
// }
// },
// {
// path: '/pg-partSwitch',
// component: () => import('@/views/pg-fis/basedate/partSwitch'),
// name: 'pg-partSwitch',//命名路由
// meta: {
// title: '零件切换管理',
// roles: ['SettleAccount.Reports'],
// icon: '发货'
// }
// },
// {
// path: '/pg-unknownAssembly',
// component: () => import('@/views/pg-fis/basedate/unknownAssembly'),
// name: 'pg-unknownAssembly',//命名路由
// meta: {
// title: '未知总成模块管理',
// roles: ['SettleAccount.Reports'],
// icon: '发货'
// }
// },
{
path: '/pg-workLine',
component: () => import('@/views/pg-fis/basedate/productLine'),
@ -66,16 +66,16 @@ const pgfis = {
icon: '供货'
}
},
{
path: '/pg-M100BIll',
component: () => import('@/views/pg-fis/basedate/m100BIll'),
name: 'pg-M100BIll',//命名路由
meta: {
title: 'M100单据信息维护',
roles: ['SettleAccount.Reports'],
icon: '客户零件'
}
},
// {
// path: '/pg-M100BIll',
// component: () => import('@/views/pg-fis/basedate/m100BIll'),
// name: 'pg-M100BIll',//命名路由
// meta: {
// title: 'M100单据信息维护',
// roles: ['SettleAccount.Reports'],
// icon: '客户零件'
// }
// },
// {
// path: '/pg-M100Online',
// component: () => import('@/views/pg-fis/basedate/m100Online'),
@ -116,16 +116,16 @@ const pgfis = {
icon: '客户零件'
}
},
{
path: '/pg-weldingAssembly',
component: () => import('@/views/pg-fis/basedate/weldingAssembly'),
name: 'pg-weldingAssembly',//命名路由
meta: {
title: '焊装总装对比',
roles: ['SettleAccount.Reports'],
icon: '客户零件'
}
},
// {
// path: '/pg-weldingAssembly',
// component: () => import('@/views/pg-fis/basedate/weldingAssembly'),
// name: 'pg-weldingAssembly',//命名路由
// meta: {
// title: '焊装总装对比',
// roles: ['SettleAccount.Reports'],
// icon: '客户零件'
// }
// },
{
path: '/pg-logRemind',
component: () => import('@/views/pg-fis/basedate/logRemind'),

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

@ -1,4 +1,4 @@
/** 派格fis路由 */
/** 路由 */
//import Layout from '@/layout/firstLayout'
import Layout from '@/layout'
@ -28,15 +28,24 @@ const pgfisPrint = {
},
{
path: '/select',
component: () => import('@/views/pg-fis/basedate/select'),
component: () => import('@/views/pg-fis/basedate/select/index'),
name: 'select',//命名路由
meta: {
title: 'M100查询',
//roles: ['SettleAccount.Reports'],
icon: '结算对比'
}
},
{
path: '/m110Search',
component: () => import('@/views/pg-fis/basedate/m110Search/index'),
name: 'm110Search',//命名路由
meta: {
title: 'M110查询',
//roles: ['SettleAccount.Reports'],
icon: '结算对比'
}
}
]
}

2
vue/src/settings.js

@ -1,5 +1,5 @@
module.exports = {
title: '长春派格汽车塑料技术有限公司结算管理系统',
title: '格拉默JIS系统',
/**
* @type {boolean} true | false

6
vue/src/views/login/index.vue

@ -2,9 +2,9 @@
<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">格拉默JIS系统</span><span class="two"></span></div>
<!-- <div class="container"><span class="one">闻荫科技-长春派格结算管理系统</span><span class="two"></span></div> -->
<!-- <div class="container"><span class="one">闻荫科技-格拉默JIS系统</span><span class="two"></span></div> -->
<div class="left-pic"/>
<div class="">
@ -12,7 +12,7 @@
长春市闻荫科技
<a
target="_blank"
href="http://www.ccwin-in.com">©2021 闻荫科技-长春派格结算管理系统</a>
href="http://www.ccwin-in.com">©2021 闻荫科技-格拉默JIS系统</a>
</div>
</div>
</div>

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

@ -1,4 +1,4 @@
<!--总成模块信息管理页-->
<!--总成模块信息管理页 pg-assemblyCfg-->
<template>
<div class="cr-body-content">
<div ref="box">
@ -295,7 +295,7 @@
},
vehicleModelQuery: {
dicTypeName: "派格车型",
dicTypeName: "车型",
},
form: {
details: [],
@ -515,6 +515,7 @@
this.$axios
.posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -541,8 +542,10 @@
}
this.listLoading = false;
});
});
this.listLoading = false;
})
.catch(err=>{
this.handleFilter()
})
},
/** 重置按钮操作 */
resetQuery(refName) {

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

@ -353,27 +353,26 @@ export default {
tempsTabs.push({
label: "零件代码",
prop: "partCode",
width: 100,
});
tempsTabs.push({
label: "零件名称",
prop: "partName",
width: 150,
});
tempsTabs.push({
label: "零件类型",
prop: "partType",
width: 120
});
tempsTabs.push({
label: "零件子类型",
prop: "partType2",
width: 120,
});
tempsTabs.push({
label: "零件描述",
prop: "Description",
width: 150,
prop: "description",
});
tempsTabs.push({
label: "厂内零代码",
prop: "relationKey",
});
return tempsTabs;
},
@ -505,6 +504,7 @@ export default {
this.listQuery
)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -531,7 +531,10 @@ export default {
}
this.listLoading = false;
});
});
})
.catch(err=>{
this.handleFilter()
})
},
getList() {
this.listLoading = true;

8
vue/src/views/pg-fis/basedate/logRemind/index.vue

@ -1,4 +1,4 @@
<!--系统日志信息页-->
<!--系统日志信息页 pg-logRemind-->
<template>
<div class="cr-body-content">
<div ref="box">
@ -263,6 +263,7 @@ export default {
this.$axios
.posts("/api/newjit/log-remind/export", this.listQuery)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -289,7 +290,10 @@ export default {
}
this.listLoading = false;
});
});
})
.catch(err=>{
this.handleFilter()
})
},
/** 重置按钮操作 */
resetQuery(refName) {

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

@ -722,7 +722,7 @@ export default {
PLList:[],//线
PLChildList:[],//线
vehicleModelQuery:{
dicTypeName:"派格车型",
dicTypeName:"车型",
},
vehicleModelList:[],//list
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],

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

@ -1,4 +1,4 @@
<!--总成模块信息管理页 todo-an:门板 -->
<!--总成模块信息管理页 pg-M100BIll -->
<template>
<div class="cr-body-content">
<div ref="box">
@ -9,24 +9,7 @@
v-show="showSearch"
:inline="true"
>
<!-- <el-row> -->
<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-form-item label="生产线:" prop="productLine">
<el-select
v-model="listQuery.productLine"
clearable
@ -637,7 +620,6 @@ export default {
listQuery: {
SkipCount: 0,
MaxResultCount: 15,
productType: 1,
ProductLine: undefined,
version:undefined,
HostSNBegin:undefined,
@ -722,10 +704,9 @@ export default {
PLList:[],//线
PLChildList:[],//线
vehicleModelQuery:{
dicTypeName:"派格车型",
dicTypeName:"车型",
},
vehicleModelList:[],//list
productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
gettime:"",
KNRlist:null,
};
@ -1083,6 +1064,7 @@ export default {
this.$axios
.posts("/api/newjit/new-m100/export", this.listExportQuery)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -1109,8 +1091,10 @@ export default {
}
this.listLoading = false;
});
});
this.listLoading = false;
})
.catch(err=>{
this.handleFilter()
})
},
/** 重置按钮操作 */
resetQuery(refName) {
@ -1424,7 +1408,7 @@ export default {
.then((response) => {
//console.log(response);
this.PLList = response.item;
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
this.PLChildList = this.PLList.sort((a,b)=>{return a.productLineCode-b.productLineCode});
this.listQuery.productLine = this.PLChildList[0].productLineCode;
this.getList();
@ -1433,18 +1417,6 @@ export default {
.catch(() => {
});
},
//线
ptypeselectChange()
{
this.$forceUpdate();
this.listQuery.productLine = "";
//console.log(this.listQuery.productType);
//console.log(this.PLChildList)
this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
//console.log(this.PLList)
//console.log(this.listQuery.productType)
//console.log(this.PLChildList)
},
//
getvehicleModel()
{

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

@ -1,4 +1,4 @@
<!--日常打印M100信息模块pg-m100normal-print-->
<!--日常打印M100信息模块 pg-m100normal-print-->
<template>
<div class="cr-body-content normalPritIndexPage">
<div ref="box">
@ -12,7 +12,6 @@
<el-form-item prop="productLine">
<el-select
v-model="listQuery.productLine"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 10px"
@ -39,7 +38,7 @@
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownload()"
@click="downloadPopShow = true"
>导出(Excel)
</el-button>
<el-button
@ -129,7 +128,7 @@
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in tableColums_main"
v-for="(item, index) in tableColums"
:key="index"
:prop="item.prop"
:label="item.label"
@ -302,20 +301,37 @@
</div>
</el-drawer>
</div>
<!-- 导出弹窗 -->
<el-dialog
title="导出"
:visible.sync="downloadPopShow"
width="60%"
>
<el-date-picker
v-model="downloadTime"
type="datetimerange"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
value-format="yyyy-MM-ddTHH:mm:ss"
></el-date-picker>
<span slot="footer" class="dialog-footer">
<el-button @click="downloadPopShow = false"> </el-button>
<el-button type="primary" @click="handleDownload()"> </el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import { mapGetters } from "vuex";
import moment from "moment";
import Detail from "./detail.vue";
import MBDetail from "./detailMB.vue";
import ZHBDetail from "./detailZHB.vue";
import { downloadFile } from "@/utils/crmindex.js";
import qs from "qs";
import RepetitionMB from "./RepetitionMB.vue";
@ -326,11 +342,8 @@ export default {
name: "M100Online",
components: {
Pagination,
CRMTableHead,
importExcel,
Detail,
MBDetail,
ZHBDetail,
RepetitionMB,
ScrapMB,
},
@ -385,7 +398,6 @@ export default {
form: {},
drawer: false,
list: null,
// M110List:null,
totalCount: 0,
listLoading: false,
customerInfo: {
@ -402,34 +414,14 @@ export default {
SkipCount: 0,
MaxResultCount: 200,
ProductLine: undefined,
GroupName:undefined,//
Version: undefined,
printBillNum: undefined,
serialNumBegin: undefined,
serialNumEnd: undefined,
HostSNBegin: undefined,
HostSNEnd: undefined,
KNRBegin: undefined,
KNREnd: undefined,
VINBegin: undefined,
VINEnd: undefined,
OnlineTimeValue: [],
OnlineTimeBegin: undefined,
OnlineTimeEnd: undefined,
ReceiveTimeValue: [],
ReceiveTimeBegin: undefined,
ReceiveTimeEnd: undefined,
billStatus: undefined,
state: [],
},
listQueryList: {
ProductLine: undefined,
SkipCount: 0,
MaxResultCount: 200,
ProductLine: undefined,
BillStatus: undefined,
CanNotPrint: false,
ZHBBillStatus: undefined,
GroupName:undefined,
// BillStatus: undefined,
// CanNotPrint: false,
},
listExportQuery: {
erpAssemblyCode: undefined,
@ -440,7 +432,6 @@ export default {
},
hostSNQuery: {
productLine: undefined,
GroupName: undefined
},
hostCheckQuery: {
printType: undefined, //0:;1:;2:;
@ -449,7 +440,6 @@ export default {
endHostSN: undefined,
beginVin: undefined,
endVin: undefined,
GroupName:undefined
},
hostPrintQuery: {
printType: undefined, //0:;1:;2:;
@ -458,7 +448,6 @@ export default {
endHostSN: undefined,
beginVin: undefined,
endVin: undefined,
GroupName: undefined,
},
vinPrintQuery: {
printType: undefined, //0:;1:;2:;
@ -487,10 +476,10 @@ export default {
details: [], //
PLList: [], //线
PLChildList: [], //线
PLChildGroupList: [], //线
isShowHostSN: false,
isShowVin: false,
isShowState: true,
tableColums:[],
//table
tableColums_main:[
{ label: "流水号", prop: "serialNum", width: 100 },
@ -499,29 +488,40 @@ export default {
{ label: "M100上线时间",prop: "onlineTime", width: 150 },
{ label: "M100接收时间", prop: "receiveTime", width: 180 },
{ label: "车型代码", prop: "vehicleModelCode", width: 120 },
{ label: "版本", prop: "version", width: 150 },
// { label: "", prop: "version", width: 150 },
{ label: "打印时间", prop: "printTime", width: 180 },
{ label: "是否打印", prop: "printBillNum", width: 100 },
{ label: "R100上线时间", prop: "r100OnlineTime", width: 150 },
{ label: "R100接收时间", prop: "r100ReceiveTime", width: 180 },
{ label: "产线", prop: "productLine", width: 120 },
{ label: "状态", prop: "billStatus", width: 120 },
{ label: "柱护板状态", prop: "printBillNum",width: 120},
{ label: "备注", prop: "remark", width: 120 },
],
//table
tableColums_detail:[],
//
downloadPopShow:false,
downloadTime:null,
timer:null,
timerList:null
};
},
beforeDestroy(){
clearInterval(this.timer)
clearInterval(this.timerList)
},
mounted() {
let _this = this
window.addEventListener('resize',function(){
_this.changeMainTableHeight()
})
this.getPLChildGroupList()
let timer = setInterval(() => {
this.timer = setInterval(() => {
this.open();
}, 5000);
this.timerList = setInterval(() => {
this.getList(undefined,true);
}, sysConfig && sysConfig.m100PrintFreshTime ? sysConfig.m100PrintFreshTime : 60000);
},
created() {
console.log("created")
this.billState.forEach((element, index) => {
if (index === 0) {
this.listQuery.state.push(element.id);
@ -530,23 +530,6 @@ export default {
this.getProductLine();
},
computed: {
// getDefaultField() {
// var tempsTabs = [];
// tempsTabs.push({ label: "", prop: "serialNum", width: 100 });
// tempsTabs.push({ label: "", prop: "hostSN", width: 120 });
// tempsTabs.push({ label: "KNR", prop: "knr", width: 150 });
// tempsTabs.push({ label: "M100线",prop: "onlineTime", width: 150 });
// tempsTabs.push({ label: "M100", prop: "receiveTime", width: 180 });
// tempsTabs.push({ label: "", prop: "vehicleModelCode", width: 120 });
// tempsTabs.push({ label: "", prop: "version", width: 150 });
// tempsTabs.push({ label: "R100线", prop: "r100OnlineTime", width: 150 });
// tempsTabs.push({ label: "R100", prop: "r100ReceiveTime", width: 180 });
// tempsTabs.push({ label: "线", prop: "productLine", width: 120 });
// tempsTabs.push({ label: "", prop: "billStatus", width: 120 });
// tempsTabs.push({ label: "", prop: "printBillNum",width: 120});
// tempsTabs.push({ label: "", prop: "remark", width: 120 });
// return tempsTabs;
// },
...mapGetters(["userInfo"]), //
},
methods: {
@ -670,12 +653,17 @@ export default {
},
/** 导出功能 assembly-cfg-erp/export */
handleDownload() {
console.log(this.downloadTime)
this.listLoading = true;
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listQuery));
let _data = {
onlineTimeBegin: this.downloadTime[0],
onlineTimeEnd: this.downloadTime[1],
productLine: this.listQuery.productLine,
}
this.$axios
.posts("/api/newjit/bill-m100/export", this.listQuery)
.posts("/api/newjit/bill-m100/export", _data)
.then((res) => {
let filename = res.item;
this.$axios
@ -702,6 +690,7 @@ export default {
});
}
this.listLoading = false;
this.downloadPopShow = false
});
});
this.listLoading = false;
@ -709,8 +698,6 @@ export default {
/** 重置按钮操作 */
resetQuery(refName) {
this.$refs[refName].resetFields();
this.listQuery.OnlineTimeValue = [];
this.listQuery.ReceiveTimeValue = [];
this.listQuery.state = [];
this.handleQuery();
this.getProductLine();
@ -720,12 +707,6 @@ export default {
this.listQuery.SkipCount = 1;
//this.getList();
},
selectValue(params) {
//
this.versionValue = params.value;
this.getList();
},
selectOptionsChange(item) {
this.getList();
},
@ -760,10 +741,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property === "zHBBillStatus") {
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未发运", 3: "已发运" }[row[column.property]];
}
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];
@ -777,40 +755,38 @@ export default {
roleFilter(type) {
return projectTypeKeyValue[type];
},
getList(data) {
this.listLoading = true;
getList(data,isFlesh) {
if(!isFlesh)this.listLoading = true;
if (data != undefined) {
this.listQueryList.SkipCount = (this.page - 1) * data.limit;
} else {
this.listQueryList.SkipCount = (this.page - 1) * 15;
this.listQueryList.SkipCount = (this.page - 1) * this.listQueryList.MaxResultCount;
}
this.listQueryList.ZHBBillStatus = 0;
this.listQuery.ZHBBillStatus = 0;
this.listQueryList.BillStatus = 2; //
// this.listQueryList.BillStatus = 2; //
this.listQueryList.ProductLine = this.listQuery.productLine; //线
this.listQueryList.CanNotPrint = false; //
this.listQueryList.GroupName = this.listQuery.GroupName
// this.listQueryList.CanNotPrint = false; //
console.log("日常打印M100查询条件:" + JSON.stringify(this.listQueryList));
this.$axios
.gets("/api/newjit/bill-m100/list2", this.listQueryList)
.then((response) => {
// 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]
//
let _tableColums_detail = []
if(response.partDisplayColumnName && response.partDisplayColumnName.length > 0){
let _names = response.partDisplayColumnName.split(",")
_names.forEach((item,index)=>{
_tableColums_detail.push(
{ label: item, prop: "partCode"+(index+1),width:160 },
)
})
}
this.tableColums = [
...this.tableColums_main,
..._tableColums_detail
]
this.list = response.m100Dtos;
let _M110Row = response.m110_Dtos[0]
_M110Row.isM110Data = true
this.list.push(_M110Row)
// this.M110List = response.bill_M110s;
this.totalCount = response.m100_TotalCount;
setTimeout(() => {
//
@ -929,7 +905,6 @@ export default {
endHostSN: undefined,
beginVin: undefined,
endVin: undefined,
GroupName: undefined,
}),
(this.hostCheckQuery.printType = 0);
this.hostPrintQuery.printType = 0;
@ -943,8 +918,6 @@ export default {
}
(this.hostSNQuery.productLine = this.listQuery.productLine);
this.hostPrintQuery.productLine = this.listQuery.productLine;
this.hostPrintQuery.GroupName = this.listQuery.GroupName;
this.hostSNQuery.GroupName = this.listQuery.GroupName
//
this.listLoading = true
this.$axios.gets("/api/newjit/dic/list?dicTypeName=零件大类")
@ -976,8 +949,6 @@ export default {
});
if (this.$refs.btn1.$el.innerText === "打印发货排序单") {
this.formTitle = "打印-发货排序单";
} else {
this.formTitle = "打印-柱护板发货排序单";
}
this.dialogFormVisible = true;
this.form = {
@ -1093,10 +1064,7 @@ export default {
}
}
/**打印时传递大众顺序号范围,接口1获取大众顺序号,接口2验证是否断号,接口3获取打印数据,接口4获得grid++模板的base64编码 */
if (
this.formTitle === "打印-发货排序单" ||
this.formTitle === "打印-柱护板发货排序单"
) {
if ( this.formTitle === "打印-发货排序单" ) {
this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
@ -1104,7 +1072,6 @@ export default {
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" +
@ -1124,15 +1091,46 @@ export default {
if (response.item.length > 0) {
//
this.$confirm(
"本次打印存在断号是否继续?" + response.item,
"提示",
{
this.isDisable = false;
this.$message({
message: "本次打印存在断号," + response.item,
type: "error",
});
// this.$confirm(
// "?" + response.item,
// "",
// {
// confirmButtonText: "",
// cancelButtonText: "",
// type: "warning",
// }
// )
// .then(() => {
// //
// this.private_printMenBan();
// })
// .catch(() => {
// this.isDisable = false;
// });
} else {
//
// todo-an:private_printMenBan
let _data = {
printType: 0,
productLine: this.listQuery.productLine,
beginHostSN: this.form.beginHostSN,
endHostSN: this.form.endHostSN,
}
this.$axios.posts("/api/newjit/bill-m100/check-already-print",_data)
.then(res=>{
console.log(1130,res)
if(res.item && res.item.length > 0){
let _tip = res.item.join(","); //todo-an:
this.$confirm(_tip, "检测已打印,是否确定继续打印?",{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
})
.then(() => {
//
this.private_printMenBan();
@ -1140,12 +1138,19 @@ export default {
.catch(() => {
this.isDisable = false;
});
} else {
//
}else{
//
this.private_printMenBan();
}
});
})
.catch(err=>{
this.isDisable = false;
})
}
})
.catch(err=>{
this.isDisable = false;
})
} else {
/**接口1获取打印数据,接口2获得grid++模板的base64编码 */
this.hostPrintQuery.beginVin = this.form.beginVin;
@ -1160,14 +1165,14 @@ export default {
/**
* 保存加载打印
*/
private_printMenBan()
{
private_printMenBan(){
this.$axios
.posts(
"/api/newjit/bill-m100/save-menban-report",
this.hostPrintQuery
)
.then((response) => {
this.isDisable = false;
console.log("保存报表");
if (response.status === false) {
this.$message({
@ -1180,11 +1185,12 @@ export default {
//-------------------------------------------
this.$axios
.posts(
"/api/newjit/bill-m100/load-menban-report",
"/api/newjit/bill-m100/load-menban-report2",
loadInput
)
.then((response) => {
console.log("加载报表");
this.dialogFormVisible = false;
if (response.status === false) {
this.$message({
message: response.message,
@ -1218,76 +1224,10 @@ export default {
});
//-------------------------------------------
}
});
},
/**
* 保存加载打印柱护板
*/
private_printZhuHuBan(isSelAll = true)
{
// /api/newjit/bill-m100/save-zhuhuban-report
//
this.$axios
.posts(
"/api/newjit/bill-m100/save-group-zhuhuban-report",
this.hostPrintQuery
)
.then((response) => {
console.log("保存柱护板报表");
if (response.status === false) {
this.$message({
message: response.message,
type: "error",
});
return;
} else if (response.status === true) {
let loadInput = {};
loadInput.dataResultType = (isSelAll == true) ? "1" : "2";
loadInput.reportIdList = response.item;
//--------------------------------------
//
this.$axios
.posts(
"/api/newjit/bill-m100/load-zhuhuban-report",
loadInput
)
.then((response) => {
console.log("加载柱护板报表");
if (response.status === false) {
this.$message({
message: response.message,
type: "error",
});
return;
} else if (response.status === true) {
//grid++jsonbase64
//this.fileQuery.report = "menban";
this.fileQuery.dataname = JSON.stringify(
response.item
);
//this.fileQuery.dataname = "";
console.log("打印json");
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban",
qs.stringify(this.fileQuery)
)
.then((response) => {
console.log("获取文件base64编码");
this.formLoading = false;
this.isDisable = false;
this.printpdf(response); //
})
.catch((error) => {
this.formLoading = false;
.catch(err=>{
this.isDisable = false;
});
}
});
//--------------------------------------
}
});
})
},
//线
@ -1318,38 +1258,7 @@ 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;
// // }
// },
/*单据状态变更 */
checkedListChange(index) {
if (this.listQuery.state.length <= 1) {
@ -1427,18 +1336,6 @@ export default {
return temp;
},
// PLChildGroupList
getPLChildGroupList(){
this.$axios
.gets(
"/api/newjit/print-template-configuration/list",
)
.then((response) => {
if (response.item !== null) {
this.PLChildGroupList= response.item;
}
});
},
},
};
</script>

354
vue/src/views/pg-fis/basedate/m110Search/detail.vue

@ -0,0 +1,354 @@
<!--M110上线信息-明细数据-->
<template>
<div class="cr-body-content">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
:row-key="getRowKeys"
:expand-row-keys="expands"
@expand-change="exChange"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<!-- <el-table-column
prop="总成名称"
label="erpAssemblyName"
sortable
width="180"
>
</el-table-column>
<el-table-column
prop="erpAssemblyVersion"
label="总成版本号"
sortable
width="180"
>
style="width: calc(100% - 47px)"
class="two-list"
</el-table-column> -->
<el-table-column type="expand" prop="details">
<template slot-scope="scope">
<el-table :data="scope.row.details">
<el-table-column
prop="partCode"
label="客户零件代码"
></el-table-column>
<el-table-column
prop="partNum"
label="客户零件数量"
></el-table-column>
<el-table-column prop="description" label="描述"></el-table-column>
<el-table-column prop="isKey" label="是否Key件">
<template slot-scope="scope">
<span v-if="scope.row.isKey == true">
<span style="color: #00b46d"></span>
</span>
<span v-else>
<span style="color: #d75c89"></span>
</span>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
<el-table-column
prop="erpAssemblyVersion"
label="总成版本号"
sortable
width="360"
>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js";
import Detail from "./detail";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, CRMTableHead, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "stockFisDiffReport",
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
expands: [], //id
getRowKeys: (row) => {
return row.id; //id
},
searchContent: "", //
customerInfo: {
parentId: "",
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
SkipCount: 0,
MaxResultCount: 15,
id: "",
},
page: 1,
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 30,
isEdit: false,
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 30;
};
},
created() {
this.getList();
},
watch: {
customerInfos: {
handler(newVal) {
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
});
if (this.customerInfo.parentId != "") {
this.getList();
}
}
},
immediate: true,
},
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "总成编号",
prop: "erpAssemblyCode",
width: 160,
});
tempsTabs.push({
label: "总成名称",
prop: "erpAssemblyName",
width: 160,
});
// tempsTabs.push({
// label: "",
// prop: "erpAssemblyName",
// width: 160,
// });
return tempsTabs;
},
},
methods: {
exChange(row, rowList) {
this.loading = true;
var that = this;
if (rowList.length) {
that.expands = [];
if (row) {
that.expands.push(row.id); // id
}
} else {
that.expands = [];
}
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
return row[column.property] || "--";
},
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
getList() {
this.listLoading = true;
console.log("详表条件:" + JSON.stringify(this.customerInfo.parentId));
//alert("" + JSON.stringify(this.customerInfo.parentId));
let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
this.$axios
.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
.then((response) => {
this.list = response;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "partCode";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
resetQuery() {},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return { textAlign: "right", background: "#FAFAFA" };
} else {
return { textAlign: "left", background: "#FAFAFA" };
}
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
},
};
</script>
<style lang="scss" scoped>
@import "../../../pg-fis/styles/crmtable.scss";
</style>

733
vue/src/views/pg-fis/basedate/m110Search/index.vue

@ -0,0 +1,733 @@
<!--M110查询模块 m110Search-->
<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="生产线22:" prop="productLine">
<el-select
v-model="listQuery.productLine"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 10px"
>
<el-option
v-for="item in PLChildList"
:key="item.id"
: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: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="流水号:" prop="serialNumBegin">
<el-input
v-model="listQuery.serialNumBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="serialNumEnd">
<el-input
v-model="listQuery.serialNumEnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="大众顺序号:" prop="hostSN">
<el-input
v-model="listQuery.HostSNBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@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: 200px"
@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: 200px"
@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: 200px"
@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: 200px"
@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: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="上线日期">
<el-date-picker
v-model="listQuery.OnlineTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:default-time="['00:00:00', '23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="接收日期">
<el-date-picker
v-model="listQuery.ReceiveTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:default-time="['00:00:00', '23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> -->
<!-- <el-form-item label="单据状态" prop="State" v-show="isShowState">
<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>
<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" style="margin-top: -30px">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<el-table-column
label="底盘号"
prop="vin "
sortable="custom"
align="center"
width="180px"
>
<template slot-scope="scope">
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{
scope.row.vin
}}</span>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
</el-table>
</div>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
style="float: right"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 抽屉控件 -->
<el-drawer
title="信息详细页"
size="75%"
direction="rtl"
:visible.sync="drawer"
:before-close="handleDrawerClose"
>
<div>
<Detail
v-bind:customerInfos="customerInfos"
style="margin-top: -35px"
></Detail>
</div>
</el-drawer>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js";
import Lockr from "lockr";
import Detail from "./detail.vue";
import { mapGetters } from "vuex";
import moment from "moment";
import { downloadFile } from "@/utils/crmindex.js";
import qs from "qs";
//
const bomUnit = [
{ key: 0, display_name: "PC" },
{ key: 1, display_name: "TON" },
{ key: 2, display_name: "Other" },
];
const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
acc[cur.key] = cur.display_name;
return acc;
}, {});
export default {
name: "select",
components: {
Pagination,
Detail,
},
directives: { permission },
data() {
return {
chkindex: 0, //
crmType: "select",
activeNames: ["1"],
rules: {
erpAssemblyName: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
billState: [
{ id: 2, name: "未打印" },
{ id: 3, name: "已打印" },
{ id: 4, name: "不可打印" },
],
valueSelect: "",
customerInfos: [],
dialogOptions: [],
versionValue: "",
searchContent: "", //
showExcelImport: false,
form: {},
drawer: false,
list: null,
totalCount: 0,
listLoading: true,
customerInfo: {
bomId: "",
},
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
SkipCount: 0,
MaxResultCount: 15,
ProductLine: undefined,
Version: undefined,
printBillNum: undefined,
serialNumBegin: undefined,
serialNumEnd: undefined,
HostSNBegin: undefined,
HostSNEnd: undefined,
KNRBegin: undefined,
KNREnd: undefined,
VINBegin: undefined,
VINEnd: undefined,
OnlineTimeValue: [],
OnlineTimeBegin: undefined,
OnlineTimeEnd: undefined,
ReceiveTimeValue: [],
ReceiveTimeBegin: undefined,
ReceiveTimeEnd: undefined,
billStatus: undefined,
state: [],
Description: undefined,
},
listExportQuery: {
erpAssemblyCode: undefined,
erpAssemblyName: undefined,
},
listPLQuery: {
BillType: 2,
},
hostSNQuery: {
productLine: undefined,
},
hostCheckQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
beginHostSN: undefined,
endHostSN: undefined,
beginVin: undefined,
endVin: undefined,
},
hostPrintQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
beginHostSN: undefined,
endHostSN: undefined,
beginVin: undefined,
endVin: undefined,
},
vinPrintQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
beginHostSN: undefined,
endHostSN: undefined,
beginVin: undefined,
endVin: undefined,
},
fileQuery: {
dataname: undefined,
},
form: {
details: [],
},
page: 1,
//
showSearch: true,
bomUnit,
drawer: false,
formTitle: "",
isEdit: false,
formLoading: false,
tableHeight: document.documentElement.clientHeight - 335,
detailTableHeight: 250,
details: [], //
PLList: [], //线
PLChildList: [], //线
isShowHostSN: false,
isShowVin: false,
isShowState: true,
};
},
mounted() {
let _this = this;
window.addEventListener("resize", function () {
_this.changeMainTableHeight();
});
},
created() {
this.billState.forEach((element, index) => {
if (index === 0) {
this.listQuery.state.push(element.id);
}
});
this.getProductLine();
},
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
tempsTabs.push({
label: "KNR",
prop: "knr",
width: 150,
});
// tempsTabs.push({
// label: "M110线",
// prop: "onlineTime",
// width: 150,
// });
// tempsTabs.push({
// label: "M110",
// prop: "receiveTime",
// width: 180,
// });
tempsTabs.push({
label: "车型代码",
prop: "vehicleModelCode",
width: 120,
});
// tempsTabs.push({
// label: "",
// prop: "version",
// width: 150,
// });
tempsTabs.push({
label: "产线",
prop: "productLine",
width: 120,
});
// tempsTabs.push({
// label: "",
// prop: "billStatus",
// width: 120,
// });
// tempsTabs.push({
// label: "",
// prop: "canNotPrint",
// width: 120,
// });
// tempsTabs.push({
// label: "R100线",
// prop: "r100OnlineTime",
// width: 150,
// });
// tempsTabs.push({
// label: "R100",
// prop: "r100ReceiveTime",
// width: 180,
// });
tempsTabs.push({
label: "备注",
prop: "description",
width: 120,
});
return tempsTabs;
},
...mapGetters(["userInfo"]), //
},
methods: {
//
changeMainTableHeight() {
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 37 - 79; //57footer79
//this.tableHeight = offsetHei -260
});
},
//
handleDrawerOpen(param) {
this.drawer = true;
var parentId = param.assemblyID; //id
this.customerInfos = [
{
ParentId: parentId,
},
];
},
handleDrawerClose(done) {
done();
},
/** 导出功能 assembly-cfg-erp/export*/
handleDownload() {
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-M110/export", this.listQuery)
.then((res) => {
this.handleFilter();
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;
});
})
.catch((err) => {
this.handleFilter();
});
},
/** 重置按钮操作 */
resetQuery(refName) {
this.$refs[refName].resetFields();
this.listQuery.OnlineTimeValue = [];
this.listQuery.ReceiveTimeValue = [];
this.listQuery.state = [];
this.handleQuery();
this.getProductLine();
},
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
//this.getList();
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];
if (date == undefined) {
return "";
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
if (column.property === "canNotPrint") {
return { true: "是", false: "否" }[row[column.property]];
}
return row[column.property] || "--";
},
roleFilter(type) {
return projectTypeKeyValue[type];
},
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.listQuery.OnlineTimeValue !== undefined) {
this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
}
if (this.listQuery.ReceiveTimeValue !== undefined) {
this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
}
if (this.chkindex == 2) {
//
this.listQuery.canNotPrint = true;
this.listQuery.billStatus = null;
} else {
this.listQuery.canNotPrint = null;
if (this.listQuery.state !== undefined) {
this.listQuery.billStatus = this.listQuery.state[0];
}
}
console.log("M110查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.gets("/api/newjit/bill-M110/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
console.log("M110结果:" + JSON.stringify(this.list));
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
this.changeMainTableHeight();
},
handleFilter() {
this.page = 1;
this.getList();
},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "right", background: "#FAFAFA" };
} else {
return { textAlign: "left", background: "#FAFAFA" };
}
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
//线
getProductLine() {
this.listPLQuery.UserId = this.userInfo.userId;
this.$axios
.gets("/api/newjit/product-line/list", this.listPLQuery)
.then((response) => {
//console.log(response);
this.PLList = response.item;
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;
// if (this.listQuery.productLine != "") {
// //线
// this.customerInfosMB = [
// {
// PrintType: 1,
// ProductLine: this.PLChildList[0].productLineCode,
// },
// ];
// }
this.getList();
//console.log(this.PLList)
})
.catch(() => {});
},
/*单据状态变更 */
checkedListChange(index) {
this.chkindex = 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);
}
},
},
};
</script>
<style lang="scss" scoped>
@import "../../../pg-fis/styles/crmtable.scss";
.divider1 {
margin: 0;
}
.divider2 {
margin: 10px;
margin-bottom: 20px;
width: 95%;
}
.label1 {
margin-left: 5px;
margin-right: 5px;
}
</style>

10
vue/src/views/pg-fis/basedate/partSwitch/index.vue

@ -1,4 +1,4 @@
<!--零件切换模块信息管理页-->
<!--零件切换模块信息管理页 pg-partSwitch-->
<template>
<div class="cr-body-content">
<div ref="box">
@ -186,7 +186,6 @@
});
},
created() {
debugger
this.getList();
},
@ -358,6 +357,7 @@
this.$axios
.posts("/api/newjit/part-switch/export", this.listQuery)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -384,8 +384,10 @@
}
this.listLoading = false;
});
});
this.listLoading = false;
})
.catch(err=>{
this.handleFilter()
})
},
/** 重置按钮操作 */
resetQuery(refName) {

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

@ -1,4 +1,4 @@
<!--零件匹配关系页-->
<!--零件匹配关系页 pg-workLine-->
<template>
<div class="cr-body-content">
<div ref="box">
@ -628,6 +628,7 @@ export default {
this.listQuery
)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -654,7 +655,10 @@ export default {
}
this.listLoading = false;
});
});
})
.catch(err=>{
this.handleFilter()
})
},
getList() {
this.listLoading = true;

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

@ -493,6 +493,7 @@ export default {
this.$axios
.posts("/api/newjit/bill-r100/export-erp-assembly-code", this.listQuery)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -519,8 +520,10 @@ export default {
}
this.listLoading = false;
});
});
this.listLoading = false;
})
.catch(err=>{
this.handleFilter()
})
},
/** 重置按钮操作 */
resetQuery(refName) {

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

@ -410,7 +410,7 @@ export default {
//UserId: this.userinfo.UserId,
},
vehicleModelQuery:{
dicTypeName:"派格车型",
dicTypeName:"车型",
},
page: 1,
//

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

@ -386,7 +386,7 @@ export default {
//UserId: this.userinfo.UserId,
},
vehicleModelQuery:{
dicTypeName:"派格车型",
dicTypeName:"车型",
},
page: 1,
//
@ -536,6 +536,7 @@ export default {
this.$axios
.posts("/api/newjit/repeat-m100/export", this.listQuery)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -565,7 +566,10 @@ export default {
.catch(() => {
this.listLoading = false;
});
});
})
.catch(err=>{
this.handleFilter()
})
},
/*单据状态变更 */
checkedListChange(index) {

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

@ -24,7 +24,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="版本:" prop="Version">
<!-- <el-form-item label="版本:" prop="Version">
<el-input
v-model="listQuery.Version"
placeholder=""
@ -33,7 +33,7 @@
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="流水号:" prop="serialNumBegin">
<el-input
v-model="listQuery.serialNumBegin"
@ -305,8 +305,8 @@ export default {
],
},
billState: [
{ id: 2, name: "未打印" },
{ id: 3, name: "已打印" },
{ id: 2, name: "未发运" },
{ id: 3, name: "已发运" },
{ id: 4, name: "不可打印" },
],
valueSelect: "",
@ -436,6 +436,16 @@ export default {
prop: "knr",
width: 150,
});
tempsTabs.push({
label: "打印时间",
prop: "printTime",
width: 180,
});
tempsTabs.push({
label: "是否打印",
prop: "printBillNum",
width: 100,
});
tempsTabs.push({
label: "M100上线时间",
prop: "onlineTime",
@ -451,11 +461,11 @@ export default {
prop: "vehicleModelCode",
width: 120,
});
tempsTabs.push({
label: "版本",
prop: "version",
width: 150,
});
// tempsTabs.push({
// label: "",
// prop: "version",
// width: 150,
// });
tempsTabs.push({
label: "产线",
prop: "productLine",
@ -572,7 +582,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未发运", 3: "已发运" }[row[column.property]];
}
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];

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

@ -557,7 +557,7 @@ export default {
carModel: ''
},
vehicleModelQuery:{
dicTypeName:"派格车型",
dicTypeName:"车型",
},
vehicleModelList:[],//list
ScanPointList:[{id:"0",label:" "},{id:"R100",label:"R100"},{id:"M100",label:"M100"}]

16
vue/src/views/pg-fis/basedate/unknownAssembly/index.vue

@ -1,4 +1,4 @@
<!--未知总成管理页-->
<!--未知总成管理页 pg-unknownAssembly-->
<template>
<div class="cr-body-content">
<div ref="box">
@ -684,7 +684,7 @@ export default {
carModel: "",
},
vehicleModelQuery: {
dicTypeName: "派格车型",
dicTypeName: "车型",
},
vehicleModelList: [], //list
ScanPointList: [
@ -891,6 +891,7 @@ export default {
this.$axios
.posts("/api/newjit/unknown-assembly/export", this.listQuery)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -917,7 +918,10 @@ export default {
}
this.listLoading = false;
});
});
})
.catch(err=>{
this.handleFilter()
})
},
/** 不重复导出功能 */
handleDownloadNotRepeat() {
@ -925,6 +929,7 @@ export default {
this.$axios
.posts("/api/newjit/unknown-assembly/export-not-repeat", this.listQuery)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -951,7 +956,10 @@ export default {
}
this.listLoading = false;
});
});
})
.catch(err=>{
this.handleFilter()
})
},
/** 重置按钮操作 */
resetQuery(refName) {

14
vue/src/views/pg-fis/basedate/weldingAssembly/index.vue

@ -519,6 +519,7 @@ export default {
this.$axios
.posts("/api/newjit/r100-m100-compare/export", this.listExportQuery)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -545,8 +546,10 @@ export default {
}
this.listLoading = false;
});
});
this.listLoading = false;
})
.catch(err=>{
this.handleFilter()
})
},
/** 导出功能 */
handleDownloadCSV() {
@ -557,6 +560,7 @@ export default {
this.$axios
.posts("/api/newjit/r100-m100-compare/export-CSV", this.listQuery)
.then((res) => {
this.handleFilter()
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@ -583,8 +587,10 @@ export default {
}
this.listLoading = false;
});
});
this.listLoading = false;
})
.catch(err=>{
this.handleFilter()
})
},
/** 重置按钮操作 */
resetQuery(refName) {

Loading…
Cancel
Save