diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
index 49266b4..27a8f36 100644
--- a/src/views/jhzx/ydjhzxGL.vue
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -45,6 +45,7 @@
}"
@checkbox-all="selectAllEvent"
@checkbox-change="selectChangeEvent"
+ :row-class-name="rowClassName"
highlight-current-row
highlight-hover-row
show-overflow
@@ -53,28 +54,28 @@
</vxe-grid>
</div>
</el-tab-pane>
- <el-tab-pane label="图纸信息" name="second">
- <div class="mytable">
- <vxe-grid
- id="id2"
- ref="xGrid2"
- border
- resizable
- keep-source
- :align="'center'"
- :height="height"
- :auto-resize="true"
- :columns="tableColumn2"
- :data="list2"
- :custom-config="{ storage: true }"
- highlight-current-row
- highlight-hover-row
- show-overflow
- :scroll-y="{enabled: true}"
- >
- </vxe-grid>
- </div>
- </el-tab-pane>
+<!-- <el-tab-pane label="图纸信息" name="second">-->
+<!-- <div class="mytable">-->
+<!-- <vxe-grid-->
+<!-- id="id2"-->
+<!-- ref="xGrid2"-->
+<!-- border-->
+<!-- resizable-->
+<!-- keep-source-->
+<!-- :align="'center'"-->
+<!-- :height="height"-->
+<!-- :auto-resize="true"-->
+<!-- :columns="tableColumn2"-->
+<!-- :data="list2"-->
+<!-- :custom-config="{ storage: true }"-->
+<!-- highlight-current-row-->
+<!-- highlight-hover-row-->
+<!-- show-overflow-->
+<!-- :scroll-y="{enabled: true}"-->
+<!-- >-->
+<!-- </vxe-grid>-->
+<!-- </div>-->
+<!-- </el-tab-pane>-->
<el-tab-pane label="到货信息" name="third">
<div class="mytable">
<vxe-grid
@@ -346,66 +347,71 @@ export default {
{ field: 'gxsj', title: '数据更新时间',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
- ],
- tableColumn2: [
- { type: 'seq', width: 60, title: '序号',fixed: "left"},
- { field: 'tzzt', title: '图纸状态', width: 100,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
-
- { field: 'czbh', title: '船号', width: 100,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
+ // { field: 'tzzt', title: '图纸状态', width: 100,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
- { field: 'pl', title: '批量', width: 100,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
+ // { field: 'czbh', title: '船号', width: 100,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
+ //
+ // { field: 'pl', title: '批量', width: 100,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
+ //
+ // { field: 'fd', title: '分段', width: 150,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
- { field: 'fd', title: '分段', width: 150,
+ { field: 'pgdTzjh.lqbxfrq', title: '领取表下发日期', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'lqbxfrq', title: '领取表下发日期', width: 100,
+ { field: 'pgdTzjh.lqbjsrq', title: '领取表接收日期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'lqbjsrq', title: '领取表接收日期', width: 150,
+ { field: 'pgdTzjh.tltxfrq', title: '套料图下发日期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'tltxfrq', title: '套料图下发日期', width: 150,
+ { field: 'pgdTzjh.tltjsrq', title: '套料图接收日期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'tltjsrq', title: '套料图接收日期', width: 150,
+ { field: 'pgdTzjh.qgxqrq', title: '切割需求日期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'qgxqrq', title: '切割需求日期', width: 150,
+ { field: 'pgdTzjh.qfxqrqxz', title: '前方需求小组期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'qfxqrqxz', title: '前方需求小组期', width: 150,
+ { field: 'pgdTzjh.qfxqrqdz', title: '前方需求大组期', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
-
- { field: 'qfxqrqdz', title: '前方需求大组期', width: 150,
+ { field: 'color', title: 'color', width: 150,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
-
-
],
+ // tableColumn2: [
+ // { type: 'seq', width: 60, title: '序号',fixed: "left"},
+ //
+ //
+ //
+ // ],
tableColumn3:[
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
{ field: 'czbh', title: '船号', width: 100,
@@ -967,6 +973,7 @@ export default {
this.list4=res.data.slList
this.list5=res.data.pwList
this.list6=res.data.qgList
+ this.list=res.data.list
}
})
},
@@ -1057,7 +1064,15 @@ export default {
getHeight() {
this.height = window.innerHeight - 230
},
+ rowClassName({ row, rowIndex ,column}){
+ console.log(row.color)
+ if(row.color==='red'){
+ return 'row-red'
+ }else if(row.color==='yellow'){
+ return 'row-yellow'
+ }
+ },
}
}
</script>
diff --git a/src/views/jhzx/ydjhzxXF.vue b/src/views/jhzx/ydjhzxXF.vue
index 7247c23..098ba7e 100644
--- a/src/views/jhzx/ydjhzxXF.vue
+++ b/src/views/jhzx/ydjhzxXF.vue
@@ -46,6 +46,7 @@
highlight-hover-row
show-overflow
:scroll-y="{enabled: true}"
+ :row-class-name="rowClassName"
>
<template #ng="{ row }">
<div>
@@ -383,6 +384,20 @@ export default {
{ field: 'gxsj', title: '数据更新时间',width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }},
+
+ { field: 'czplpNew.xfqLqb', title: '领取表下发日期', width: 100,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+
+
+ { field: 'czplpNew.xfqTlt', title: '套料图下发日期', width: 150,
+ filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ filterRender: { name: 'FilterCombination', },
+ },
+
+
],
tableColumn2: [
{ type: 'seq', width: 60, title: '序号',fixed: "left"},
@@ -1093,6 +1108,7 @@ export default {
}
getYdjh(this.queryParam).then((res) => {
this.list = res.data
+ console.log(this.list)
if (this.$refs.xGrid) {
this.$refs.xGrid.loadData(this.list)
}
@@ -1106,7 +1122,15 @@ export default {
getHeight() {
this.height = window.innerHeight - 150
},
+ rowClassName({ row, rowIndex ,column}){
+ console.log(row.color)
+ if(row.color==='red'){
+ return 'row-red'
+ }else if(row.color==='yellow'){
+ return 'row-yellow'
+ }
+ },
}
}
</script>