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

【派格PC前端】2024-04-17需求更改

HQ
安虹睿 7 months ago
parent
04ff49a2f8
commit
f423d71a7c
5 changed files with 96 additions and 66 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. 4
      vue/src/router/modules/fisprint.js
  2. 9
      vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
  3. 52
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  4. 26
      vue/src/views/pg-fis/basedate/planControl/index.vue
  5. 71
      vue/src/views/pg-fis/basedate/select/index.vue

4
vue/src/router/modules/fisprint.js
View File

@ -21,7 +21,7 @@ const pgfisPrint = {
component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
name: 'pg-M100Online',//命名路由 name: 'pg-M100Online',//命名路由
meta: { meta: {
title: '日常打印M100信息', title: '日常打印E001信息',
//roles: ['SettleAccount.Reports'], //roles: ['SettleAccount.Reports'],
icon: '客户零件' icon: '客户零件'
} }
@ -31,7 +31,7 @@ const pgfisPrint = {
component: () => import('@/views/pg-fis/basedate/select'), component: () => import('@/views/pg-fis/basedate/select'),
name: 'select',//命名路由 name: 'select',//命名路由
meta: { meta: {
title: 'M100查询', title: 'E001查询',
//roles: ['SettleAccount.Reports'], //roles: ['SettleAccount.Reports'],
icon: '结算对比' icon: '结算对比'
} }

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

@ -283,6 +283,10 @@ export default {
return []; return [];
}, },
}, },
handleDeleteCallBack:{
type: Function,
default:null
}
}, },
data() { data() {
const validVersion = (rule, value, callback) => { const validVersion = (rule, value, callback) => {
@ -393,7 +397,7 @@ export default {
}); });
}, },
created() { created() {
this.getList(); this.handleFilter()
}, },
watch: { watch: {
customerInfosMB: { customerInfosMB: {
@ -675,7 +679,6 @@ export default {
handleDelete() { handleDelete() {
//debugger; //debugger;
let params = this.zuofei; let params = this.zuofei;
this.$axios this.$axios
.posts("/api/newjit/MenBanPackingList/scrap", params) .posts("/api/newjit/MenBanPackingList/scrap", params)
.then((response) => { .then((response) => {
@ -690,9 +693,9 @@ export default {
duration: 2000, duration: 2000,
}); });
this.getList(); this.getList();
if(this.handleDeleteCallBack)this.handleDeleteCallBack()
}); });
this.dialogTableVisible = false; this.dialogTableVisible = false;
}, },
//作废操作，支持批量操作-门板 //作废操作，支持批量操作-门板

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

@ -203,7 +203,11 @@
@open="opens()" @open="opens()"
size="900px" size="900px"
> >
<ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB> <ScrapMB
v-if="drawerMBDelete"
v-bind:customerInfosMB="customerInfosMB"
:handleDeleteCallBack="handleFilter"
></ScrapMB>
</el-drawer> </el-drawer>
<!--柱护板重打--> <!--柱护板重打-->
<el-drawer <el-drawer
@ -256,6 +260,7 @@
@sort-change="sortChange" @sort-change="sortChange"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="handleRowClick" @row-click="handleRowClick"
:row-class-name="tableRowClassName"
> >
<el-table-column <el-table-column
label="底盘号" label="底盘号"
@ -704,12 +709,12 @@ export default {
width: 150, width: 150,
}); });
tempsTabs.push({ tempsTabs.push({
label: "M100上线时间", label: "E001上线时间",
prop: "onlineTime", prop: "onlineTime",
width: 150, width: 150,
}); });
tempsTabs.push({ tempsTabs.push({
label: "M100接收时间", label: "E001接收时间",
prop: "receiveTime", prop: "receiveTime",
width: 180, width: 180,
}); });
@ -723,16 +728,16 @@ export default {
// prop: "version", // prop: "version",
// width: 150, // width: 150,
// }); // });
tempsTabs.push({ // tempsTabs.push({
label: "R100上线时间", // label: "R100上线时间",
prop: "r100OnlineTime", // prop: "r100OnlineTime",
width: 150, // width: 150,
}); // });
tempsTabs.push({ // tempsTabs.push({
label: "R100接收时间", // label: "R100接收时间",
prop: "r100ReceiveTime", // prop: "r100ReceiveTime",
width: 180, // width: 180,
}); // });
tempsTabs.push({ tempsTabs.push({
label: "产线", label: "产线",
prop: "productLine", prop: "productLine",
@ -765,6 +770,12 @@ export default {
...mapGetters(["userInfo"]), //获取当前用户信息 ...mapGetters(["userInfo"]), //获取当前用户信息
}, },
methods: { methods: {
tableRowClassName({row, rowIndex}) {
if(row.billStatus == 1){
return 'error-row';
}
return '';
},
// 更改主表格高度 // 更改主表格高度
changeMainTableHeight(){ changeMainTableHeight(){
this.$nextTick(()=>{ this.$nextTick(()=>{
@ -978,7 +989,6 @@ export default {
}, },
//抽屉 //抽屉
handleDrawerOpen(param) { handleDrawerOpen(param) {
debugger
this.drawer = true; this.drawer = true;
var parentId = param.assemblyID; //主键id var parentId = param.assemblyID; //主键id
this.customerInfos = [ this.customerInfos = [
@ -1002,7 +1012,6 @@ export default {
}, },
/** 导出功能 assembly-cfg-erp/export */ /** 导出功能 assembly-cfg-erp/export */
handleDownload() { handleDownload() {
debugger
this.listLoading = true; this.listLoading = true;
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode; this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
@ -1109,7 +1118,7 @@ export default {
/** 格式化字段 */ /** 格式化字段 */
fieldFormatter(row, column) { fieldFormatter(row, column) {
if (column.property === "billStatus") { if (column.property === "billStatus") {
return { 1: "未解析", 2: "已解析", 3: "已打印", 4: "断号" }[row[column.property]]; return { 1: "未匹配", 2: "已解析", 3: "已打印", 4: "断号" }[row[column.property]];
} }
if (column.property === "zHBBillStatus") { if (column.property === "zHBBillStatus") {
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]]; return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
@ -1171,7 +1180,6 @@ export default {
.then((response) => { .then((response) => {
this.list = response.items; this.list = response.items;
this.totalCount = response.totalCount; this.totalCount = response.totalCount;
debugger
setTimeout(() => { setTimeout(() => {
//大数据量加载时 //大数据量加载时
this.listLoading = false; this.listLoading = false;
@ -1209,7 +1217,6 @@ export default {
}, },
// 向子组件更新值 // 向子组件更新值
valueselectChange(val) { valueselectChange(val) {
debugger
this.$forceUpdate(); this.$forceUpdate();
@ -1892,7 +1899,6 @@ export default {
//获取所有产线 //获取所有产线
getProductLine() { getProductLine() {
debugger
this.listPLQuery.UserId = this.userInfo == null ? null : this.userInfo.userId; this.listPLQuery.UserId = this.userInfo == null ? null : this.userInfo.userId;
// console.log( // console.log(
// "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" + // "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" +
@ -2080,6 +2086,14 @@ export default {
padding: 10px; padding: 10px;
line-height: 20px; line-height: 20px;
} }
/deep/ .el-table .error-row {
background: #fbd6d6 !important;
td{
background: #fbd6d6 !important;
}
}
</style> </style>

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

@ -35,7 +35,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="涂装下线时间"> <el-form-item label="涂装下线时间" prop="paintOfflineTimeBegin">
<el-date-picker <el-date-picker
v-model="listQuery.paintOfflineTimeBegin" v-model="listQuery.paintOfflineTimeBegin"
size="small" size="small"
@ -43,7 +43,7 @@
type="datetime" type="datetime"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="-"> <el-form-item label="-" prop="paintOfflineTimeEnd">
<el-date-picker <el-date-picker
v-model="listQuery.paintOfflineTimeEnd" v-model="listQuery.paintOfflineTimeEnd"
size="small" size="small"
@ -52,7 +52,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="总装上线时间"> <el-form-item label="总装上线时间" prop="onlineTimeBegin">
<el-date-picker <el-date-picker
v-model="listQuery.onlineTimeBegin" v-model="listQuery.onlineTimeBegin"
size="small" size="small"
@ -60,7 +60,7 @@
type="datetime" type="datetime"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="-"> <el-form-item label="-" prop="onlineTimeEnd">
<el-date-picker <el-date-picker
v-model="listQuery.onlineTimeEnd" v-model="listQuery.onlineTimeEnd"
size="small" size="small"
@ -69,7 +69,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="序列号"> <el-form-item label="序列号" prop="serialNumBegin">
<el-input <el-input
v-model="listQuery.serialNumBegin" v-model="listQuery.serialNumBegin"
clearable clearable
@ -77,7 +77,7 @@
style="width: 120px" style="width: 120px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="-"> <el-form-item label="-" prop="serialNumEnd">
<el-input <el-input
v-model="listQuery.serialNumEnd" v-model="listQuery.serialNumEnd"
clearable clearable
@ -86,7 +86,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="流水号"> <el-form-item label="流水号" prop="hostSNBegin">
<el-input <el-input
v-model="listQuery.hostSNBegin" v-model="listQuery.hostSNBegin"
clearable clearable
@ -94,7 +94,7 @@
style="width: 120px" style="width: 120px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="-"> <el-form-item label="-" prop="hostSNEnd">
<el-input <el-input
v-model="listQuery.hostSNEnd" v-model="listQuery.hostSNEnd"
clearable clearable
@ -103,14 +103,14 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="主机厂生产线"> <el-form-item label="主机厂生产线" prop="productLine">
<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>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间" prop="createTimeBegin">
<el-date-picker <el-date-picker
v-model="listQuery.createTimeBegin" v-model="listQuery.createTimeBegin"
size="small" size="small"
@ -118,7 +118,7 @@
type="datetime" type="datetime"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="-"> <el-form-item label="-" prop="createTimeEnd">
<el-date-picker <el-date-picker
v-model="listQuery.createTimeEnd" v-model="listQuery.createTimeEnd"
size="small" size="small"
@ -127,7 +127,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="导入时间"> <el-form-item label="导入时间" prop="importTimeBegin">
<el-date-picker <el-date-picker
v-model="listQuery.importTimeBegin" v-model="listQuery.importTimeBegin"
size="small" size="small"
@ -135,7 +135,7 @@
type="datetime" type="datetime"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="-"> <el-form-item label="-" prop="importTimeEnd">
<el-date-picker <el-date-picker
v-model="listQuery.importTimeEnd" v-model="listQuery.importTimeEnd"
size="small" size="small"

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

@ -96,7 +96,7 @@
/> />
</el-form-item> --> </el-form-item> -->
<!-- <el-row> --> <!-- <el-row> -->
<el-form-item label="流水号:"> <el-form-item label="流水号:" prop="HostSNBegin" >
<!-- <el-form-item label="大众顺序号:" prop="hostSN"> --> <!-- <el-form-item label="大众顺序号:" prop="hostSN"> -->
<el-input <el-input
v-model="listQuery.HostSNBegin" v-model="listQuery.HostSNBegin"
@ -107,7 +107,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="-"> <el-form-item label="-" prop="HostSNEnd">
<el-input <el-input
v-model="listQuery.HostSNEnd" v-model="listQuery.HostSNEnd"
placeholder="" placeholder=""
@ -271,6 +271,7 @@
@sort-change="sortChange" @sort-change="sortChange"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="handleRowClick" @row-click="handleRowClick"
:row-class-name="tableRowClassName"
> >
<el-table-column <el-table-column
label="底盘号" label="底盘号"
@ -633,12 +634,12 @@ export default {
width: 150, width: 150,
}); });
tempsTabs.push({ tempsTabs.push({
label: "M100上线时间", label: "E001上线时间",
prop: "onlineTime", prop: "onlineTime",
width: 150, width: 150,
}); });
tempsTabs.push({ tempsTabs.push({
label: "M100接收时间", label: "E001接收时间",
prop: "receiveTime", prop: "receiveTime",
width: 180, width: 180,
}); });
@ -657,31 +658,31 @@ export default {
prop: "productLine", prop: "productLine",
width: 120, width: 120,
}); });
tempsTabs.push({ // tempsTabs.push({
label: "状态", // label: "状态",
prop: "billStatus", // prop: "billStatus",
width: 120, // width: 120,
}); // });
tempsTabs.push({ // tempsTabs.push({
label: "柱护板状态", // label: "柱护板状态",
prop: "printBillNum", // prop: "printBillNum",
width: 120, // width: 120,
}); // });
tempsTabs.push({ // tempsTabs.push({
label: "不可打印", // label: "不可打印",
prop: "canNotPrint", // prop: "canNotPrint",
width: 120, // width: 120,
}); // });
tempsTabs.push({ // tempsTabs.push({
label: "R100上线时间", // label: "R100上线时间",
prop: "r100OnlineTime", // prop: "r100OnlineTime",
width: 150, // width: 150,
}); // });
tempsTabs.push({ // tempsTabs.push({
label: "R100接收时间", // label: "R100接收时间",
prop: "r100ReceiveTime", // prop: "r100ReceiveTime",
width: 180, // width: 180,
}); // });
tempsTabs.push({ tempsTabs.push({
label: "备注", label: "备注",
prop: "description", prop: "description",
@ -692,6 +693,12 @@ export default {
...mapGetters(["userInfo"]), //获取当前用户信息 ...mapGetters(["userInfo"]), //获取当前用户信息
}, },
methods: { methods: {
tableRowClassName({row, rowIndex}) {
if(row.billStatus == 1){
return 'error-row';
}
return '';
},
// 更改主表格高度 // 更改主表格高度
changeMainTableHeight(){ changeMainTableHeight(){
this.$nextTick(()=>{ this.$nextTick(()=>{
@ -1693,6 +1700,12 @@ export default {
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
} }
/deep/ .el-table .error-row {
background: #fbd6d6 !important;
td{
background: #fbd6d6 !important;
}
}
</style> </style>

Write Preview
Loading…
Cancel
Save