zhibinlv
/
FIS1.5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【长春派格1.5】多页面条件修改

HQ
安虹睿 11 months ago
parent
cc319f4be9
commit
de5ac5285d
7 changed files with 111 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      vue/src/router/modules/fis.js
  2. 13
      vue/src/views/pg-fis/basedate/alreadyPrint/index.vue
  3. 4
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  4. 6
      vue/src/views/pg-fis/basedate/planControl/index.vue
  5. 31
      vue/src/views/pg-fis/basedate/repeatR100/index.vue
  6. 24
      vue/src/views/pg-fis/basedate/select/index.vue
  7. 33
      vue/src/views/pg-fis/basedate/unknownAssembly/index.vue

80
vue/src/router/modules/fis.js
View File

@ -36,16 +36,16 @@ const pgfis = {
icon: '发货' icon: '发货'
} }
}, },
{ // {
path: '/pg-partSwitch', // path: '/pg-partSwitch',
component: () => import('@/views/pg-fis/basedate/partSwitch'), // component: () => import('@/views/pg-fis/basedate/partSwitch'),
name: 'pg-partSwitch',//命名路由 // name: 'pg-partSwitch',//命名路由
meta: { // meta: {
title: '零件切换管理', // title: '零件切换管理',
//roles: ['SettleAccount.Reports'], // //roles: ['SettleAccount.Reports'],
icon: '发货' // icon: '发货'
} // }
}, // },
{ {
path: '/pg-unknownAssembly', path: '/pg-unknownAssembly',
component: () => import('@/views/pg-fis/basedate/unknownAssembly'), component: () => import('@/views/pg-fis/basedate/unknownAssembly'),
@ -66,16 +66,16 @@ const pgfis = {
icon: '供货' icon: '供货'
} }
}, },
{ // {
path: '/pg-M100BIll', // path: '/pg-M100BIll',
component: () => import('@/views/pg-fis/basedate/m100BIll'), // component: () => import('@/views/pg-fis/basedate/m100BIll'),
name: 'pg-M100BIll',//命名路由 // name: 'pg-M100BIll',//命名路由
meta: { // meta: {
title: 'M100单据信息维护', // title: 'M100单据信息维护',
//roles: ['SettleAccount.Reports'], // //roles: ['SettleAccount.Reports'],
icon: '客户零件' // icon: '客户零件'
} // }
}, // },
// { // {
// path: '/pg-M100Online', // path: '/pg-M100Online',
// component: () => import('@/views/pg-fis/basedate/m100Online'), // component: () => import('@/views/pg-fis/basedate/m100Online'),
@ -106,26 +106,26 @@ const pgfis = {
// icon: '客户零件' // icon: '客户零件'
// } // }
// }, // },
{ // {
path: '/pg-R100Online', // path: '/pg-R100Online',
component: () => import('@/views/pg-fis/basedate/r100Online'), // component: () => import('@/views/pg-fis/basedate/r100Online'),
name: 'pg-R100Online',//命名路由 // name: 'pg-R100Online',//命名路由
meta: { // meta: {
title: 'R100上线信息', // title: 'R100上线信息',
//roles: ['SettleAccount.Reports'], // //roles: ['SettleAccount.Reports'],
icon: '客户零件' // icon: '客户零件'
} // }
}, // },
{ // {
path: '/pg-weldingAssembly', // path: '/pg-weldingAssembly',
component: () => import('@/views/pg-fis/basedate/weldingAssembly'), // component: () => import('@/views/pg-fis/basedate/weldingAssembly'),
name: 'pg-weldingAssembly',//命名路由 // name: 'pg-weldingAssembly',//命名路由
meta: { // meta: {
title: '焊装总装对比', // title: '焊装总装对比',
//roles: ['SettleAccount.Reports'], // //roles: ['SettleAccount.Reports'],
icon: '客户零件' // icon: '客户零件'
} // }
}, // },
{ {
path: '/pg-logRemind', path: '/pg-logRemind',
component: () => import('@/views/pg-fis/basedate/logRemind'), component: () => import('@/views/pg-fis/basedate/logRemind'),

13
vue/src/views/pg-fis/basedate/alreadyPrint/index.vue
View File

@ -66,7 +66,7 @@
</el-form-item> </el-form-item>
<!-- <el-row> --> <!-- <el-row> -->
<el-form-item label="大众顺序号:" prop="hostSN"> <el-form-item label="流水号:" prop="hostSN">
<el-input <el-input
v-model="listQuery.HostSNBegin" v-model="listQuery.HostSNBegin"
placeholder="" placeholder=""
@ -87,7 +87,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="KNR:" prop="KNRBegin"> <el-form-item label="车身号:" prop="KNRBegin">
<el-input <el-input
v-model="listQuery.KNRBegin" v-model="listQuery.KNRBegin"
placeholder="" placeholder=""
@ -318,7 +318,7 @@ export default {
billState: [ billState: [
{ id: 1, name: "未解析" }, { id: 1, name: "未解析" },
{ id: 2, name: "已解析" }, { id: 2, name: "已解析" },
{ id: 4, name: "断号" }, // { id: 4, name: "断号" },
], ],
//valueSelect: "", //valueSelect: "",
customerInfos: [], customerInfos: [],
@ -428,7 +428,7 @@ export default {
PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位 PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
productTypeList: [ productTypeList: [
{ id: 1, name: "门板" }, { id: 1, name: "门板" },
{ id: 2, name: "柱护板" }, // { id: 2, name: "柱护板" },
], ],
//isShowHostSN: false, //isShowHostSN: false,
//isShowVin: false, //isShowVin: false,
@ -436,6 +436,11 @@ export default {
}; };
}, },
mounted() { mounted() {
// 查询条件20240117更改（只改文字，参数不变）
// - 生产线 去掉 柱护板 选项
// - 大众顺序号 改成 流水号
// - KNR 改成 车身号
// - 单据状态 隐藏 断号
let _this = this let _this = this
window.addEventListener('resize',function(){ window.addEventListener('resize',function(){
_this.changeMainTableHeight() _this.changeMainTableHeight()

4
vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
View File

@ -662,7 +662,7 @@ export default {
PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位 PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
productTypeList: [ productTypeList: [
{ id: 1, name: "门板" }, { id: 1, name: "门板" },
{ id: 2, name: "柱护板" }, // { id: 2, name: "柱护板" },
], ],
isShowHostSN: false, isShowHostSN: false,
isShowVin: false, isShowVin: false,
@ -1305,7 +1305,7 @@ export default {
_name = this.productTypeList[0].name + ': ' + _productLineName _name = this.productTypeList[0].name + ': ' + _productLineName
} }
// 柱护板 // 柱护板
else if(type == 2){ else if(type == 2 && this.productTypeList[1]){
_name = this.productTypeList[1].name + ': ' + _productLineName + ' (' + this.listQuery.GroupName + ')' _name = this.productTypeList[1].name + ': ' + _productLineName + ' (' + this.listQuery.GroupName + ')'
} }
return _name return _name

6
vue/src/views/pg-fis/basedate/planControl/index.vue
View File

@ -103,7 +103,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="生产线"> <el-form-item label="主机厂生产线">
<el-select v-model="listQuery.productLine" clearable> <el-select v-model="listQuery.productLine" clearable>
<el-option label="A" value="A"></el-option> <el-option label="A" value="A"></el-option>
<el-option label="B" value="B"></el-option> <el-option label="B" value="B"></el-option>
@ -322,14 +322,14 @@
{ label: "底盘号", prop: "vin", width: 180 }, { label: "底盘号", prop: "vin", width: 180 },
{ label: "序列号", prop: "serialNum", width: 120 }, { label: "序列号", prop: "serialNum", width: 120 },
{ label: "流水号", prop: "hostSN", width: 120 }, { label: "流水号", prop: "hostSN", width: 120 },
{ label: "生产线", prop: "productLine", width: 120 }, { label: "主机厂生产线", prop: "productLine", width: 130 },
{ label: "工厂", prop: "factory", width: 120 }, { label: "工厂", prop: "factory", width: 120 },
{ label: "工位", prop: "workLocation", width: 120 }, { label: "工位", prop: "workLocation", width: 120 },
{ label: "车位", prop: "vehicleLocation", width: 120 }, { label: "车位", prop: "vehicleLocation", width: 120 },
{ label: "车身号", prop: "vehicleBodyCode", width: 120 }, { label: "车身号", prop: "vehicleBodyCode", width: 120 },
{ label: "车型代码", prop: "vehicleModelCode", width: 180 }, { label: "车型代码", prop: "vehicleModelCode", width: 180 },
{ label: "车型名称", prop: "vehicleModelName", width: 120 }, { label: "车型名称", prop: "vehicleModelName", width: 120 },
{ label: "车型描述", prop: "vehicleModelDesc", width: 120 }, { label: "车型描述", prop: "vehicleModelDesc", width: 240 },
{ label: "规格", prop: "spec", width: 120 }, { label: "规格", prop: "spec", width: 120 },
{ label: "规格说明", prop: "specDesc", width: 120 }, { label: "规格说明", prop: "specDesc", width: 120 },
{ label: "类别", prop: "type", width: 120 }, { label: "类别", prop: "type", width: 120 },

31
vue/src/views/pg-fis/basedate/repeatR100/index.vue
View File

@ -13,7 +13,7 @@
<el-checkbox v-model="listQuery.checked1" >M100</el-checkbox> <el-checkbox v-model="listQuery.checked1" >M100</el-checkbox>
<el-checkbox v-model="listQuery.checked2" >R100</el-checkbox> <el-checkbox v-model="listQuery.checked2" >R100</el-checkbox>
</el-form-item> --> </el-form-item> -->
<el-form-item label="数据采集点" prop="State" > <!-- <el-form-item label="数据采集点" prop="State" >
<el-checkbox-group v-model="listQuery.state"> <el-checkbox-group v-model="listQuery.state">
<el-checkbox <el-checkbox
v-for="(item, index) in billState" v-for="(item, index) in billState"
@ -24,7 +24,7 @@
{{ item.name }} {{ item.name }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item> -->
<el-form-item label="生产线:" prop="productType"> <el-form-item label="生产线:" prop="productType">
<el-select <el-select
@ -61,27 +61,27 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="起始顺序号" prop="HostSNBegin"> <el-form-item label="起始流水号" prop="HostSNBegin">
<el-input <el-input
v-model="listQuery.HostSNBegin" v-model="listQuery.HostSNBegin"
placeholder="起始顺序号" placeholder="起始流水号"
clearable clearable
size="small" size="small"
style="width: 120px" style="width: 120px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="结束顺序号" prop="HostSNEnd"> <el-form-item label="结束流水号" prop="HostSNEnd">
<el-input <el-input
v-model="listQuery.HostSNEnd" v-model="listQuery.HostSNEnd"
placeholder="结束顺序号" placeholder="结束流水号"
clearable clearable
size="small" size="small"
style="width: 120px" style="width: 120px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="KNR:" prop="KNRBegin"> <el-form-item label="车身号:" prop="KNRBegin">
<el-input <el-input
v-model="listQuery.KNRBegin" v-model="listQuery.KNRBegin"
placeholder="" placeholder=""
@ -149,7 +149,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> --> /> -->
<el-form-item label="版本" prop="Version"> <!-- <el-form-item label="版本" prop="Version">
<el-input <el-input
v-model="listQuery.Version" v-model="listQuery.Version"
placeholder="请输入总成名称" placeholder="请输入总成名称"
@ -158,7 +158,7 @@
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="上线日期"> <el-form-item label="上线日期">
<el-date-picker <el-date-picker
@ -424,7 +424,7 @@ export default {
// ], // ],
productTypeList: [ productTypeList: [
{ id: 1, name: "门板" }, { id: 1, name: "门板" },
{ id: 2, name: "柱护板" }, // { id: 2, name: "柱护板" },
], ],
showSearch: true, showSearch: true,
bomUnit, bomUnit,
@ -448,11 +448,12 @@ export default {
}, },
created() { created() {
//this.getList(); //this.getList();
this.billState.forEach((element, index) => { // this.billState.forEach((element, index) => {
if (index === 0) { // if (index === 0) {
this.listQuery.state.push(element.id); // this.listQuery.state.push(element.id);
} // }
}); // });
this.listQuery.state.push(3)
this.getvehicleModel(); this.getvehicleModel();
this.getProductLine(); this.getProductLine();
}, },

24
vue/src/views/pg-fis/basedate/select/index.vue
View File

@ -64,7 +64,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="版本:" prop="Version"> <!-- <el-form-item label="版本:" prop="Version">
<el-input <el-input
v-model="listQuery.Version" v-model="listQuery.Version"
placeholder="" placeholder=""
@ -73,9 +73,9 @@
style="width: 200px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<!-- </el-row> --> <!-- </el-row> -->
<el-form-item label="流水号:" prop="serialNumBegin"> <!-- <el-form-item label="流水号:" prop="serialNumBegin">
<el-input <el-input
v-model="listQuery.serialNumBegin" v-model="listQuery.serialNumBegin"
placeholder="" placeholder=""
@ -94,9 +94,10 @@
style="width: 200px" style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<!-- <el-row> --> <!-- <el-row> -->
<el-form-item label="大众顺序号:" prop="hostSN"> <el-form-item label="流水号:" prop="hostSN">
<!-- <el-form-item label="大众顺序号:" prop="hostSN"> -->
<el-input <el-input
v-model="listQuery.HostSNBegin" v-model="listQuery.HostSNBegin"
placeholder="" placeholder=""
@ -117,7 +118,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="KNR:" prop="KNRBegin"> <el-form-item label="车身号:" prop="KNRBegin">
<el-input <el-input
v-model="listQuery.KNRBegin" v-model="listQuery.KNRBegin"
placeholder="" placeholder=""
@ -477,7 +478,7 @@ export default {
billState: [ billState: [
{ id: 2, name: "未打印" }, { id: 2, name: "未打印" },
{ id: 3, name: "已打印" }, { id: 3, name: "已打印" },
{ id: 4, name: "不可打印" }, // { id: 4, name: "不可打印" },
], ],
valueSelect: "", valueSelect: "",
customerInfos: [], customerInfos: [],
@ -587,7 +588,7 @@ export default {
PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位 PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
productTypeList: [ productTypeList: [
{ id: 1, name: "门板" }, { id: 1, name: "门板" },
{ id: 2, name: "柱护板" }, // { id: 2, name: "柱护板" },
], ],
isShowHostSN: false, isShowHostSN: false,
isShowVin: false, isShowVin: false,
@ -595,6 +596,13 @@ export default {
}; };
}, },
mounted() { mounted() {
// 查询条件20240117更改（只改文字，参数不变）
// - 生产线 去掉 柱护板 选项
// - 隐藏 版本
// - 隐藏 流水号
// - 大众顺序号 改成 流水号
// - KNR 改成 车身号
// - 隐藏 不可打印
let _this = this let _this = this
window.addEventListener('resize',function(){ window.addEventListener('resize',function(){
_this.changeMainTableHeight() _this.changeMainTableHeight()

33
vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
View File

@ -9,7 +9,17 @@
v-show="showSearch" v-show="showSearch"
:inline="true" :inline="true"
> >
<el-form-item label="KNR:" prop="KNRBegin"> <el-form-item label="流水号:" prop="HostSN2">
<el-input
v-model="listQuery.HostSN2"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车身号:" prop="KNRBegin">
<el-input <el-input
v-model="listQuery.KNRBegin" v-model="listQuery.KNRBegin"
placeholder="" placeholder=""
@ -69,7 +79,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="版本" prop="Version"> <!-- <el-form-item label="版本" prop="Version">
<el-input <el-input
v-model="listQuery.Version" v-model="listQuery.Version"
placeholder="请输入版本" placeholder="请输入版本"
@ -78,7 +88,7 @@
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="上线日期"> <el-form-item label="上线日期">
<el-date-picker <el-date-picker
@ -106,7 +116,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item> <!-- <el-form-item>
<el-button <el-button
class="addAssy" class="addAssy"
size="mini" size="mini"
@ -115,9 +125,9 @@
@click="handleCreate" @click="handleCreate"
>添加总成 >添加总成
</el-button> </el-button>
</el-form-item> </el-form-item> -->
<el-form-item label="扫描点" prop="ScanPoint"> <!-- <el-form-item label="扫描点" prop="ScanPoint">
<el-select <el-select
v-model="listQuery.ScanPoint" v-model="listQuery.ScanPoint"
placeholder="请选择" placeholder="请选择"
@ -131,7 +141,7 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button <el-button
@ -613,7 +623,7 @@ export default {
OnlineTimeEnd: undefined, OnlineTimeEnd: undefined,
KNR: undefined, KNR: undefined,
VIN: undefined, VIN: undefined,
ScanPoint: undefined, ScanPoint: 'M100',
BillDescription: undefined, BillDescription: undefined,
}, },
listUnknownAssemblyQuery: { listUnknownAssemblyQuery: {
@ -695,6 +705,13 @@ export default {
}; };
}, },
mounted() { mounted() {
// 20240117修改
// 1. 查询条件
// - 加 流水号 筛选条件，数据表字段对应 HostSN2
// - KNR 查询条件 改成 车身号
// - 隐藏 版本号
// - 隐藏 扫描点， 默认传值 M100，
// 2. 去掉 添加总成 按钮
this.$nextTick(() => { this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight; var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei); //console.log(offsetHei);

Write Preview
Loading…
Cancel
Save