diff --git a/src/views/sjzx/bclqCX.vue b/src/views/sjzx/bclqCX.vue
index c181c21..3ba3c09 100644
--- a/src/views/sjzx/bclqCX.vue
+++ b/src/views/sjzx/bclqCX.vue
@@ -116,7 +116,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'BclqCX',
data() {
return {
queryParam: {
diff --git a/src/views/sjzx/bctltCX.vue b/src/views/sjzx/bctltCX.vue
index c7a2b3a..0f6cd29 100644
--- a/src/views/sjzx/bctltCX.vue
+++ b/src/views/sjzx/bctltCX.vue
@@ -116,7 +116,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'BctltCX',
data() {
return {
queryParam: {
@@ -149,11 +149,11 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dcZlZ', title: '组立', width: 100,
+ { field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ylzd1Z', title: '划线类型', width: 100,
+ { field: 'ylzd1Z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
diff --git a/src/views/sjzx/bcybCX.vue b/src/views/sjzx/bcybCX.vue
index b133674..2411c21 100644
--- a/src/views/sjzx/bcybCX.vue
+++ b/src/views/sjzx/bcybCX.vue
@@ -116,7 +116,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'BcybCX',
data() {
return {
queryParam: {
@@ -156,7 +156,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ylzd1', title: '划线类型', width: 100,editRender: { name: 'input' },
+ { field: 'ylzd1', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX']
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -164,11 +164,11 @@ export default {
- { field: 'dcZl', title: '组立', width: 100,editRender: { name: 'input' },
+ { field: 'dcZl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'zzcj', title: '加工跨', width: 100,editRender: { name: 'input' },
+ { field: 'zzcj', title: '加工跨', width: 100,formatter: ['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
diff --git a/src/views/sjzx/bomcx.vue b/src/views/sjzx/bomcx.vue
index 8b66b22..9aed2b1 100644
--- a/src/views/sjzx/bomcx.vue
+++ b/src/views/sjzx/bomcx.vue
@@ -21,16 +21,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -92,10 +92,10 @@
:align="allAlign"
:data="tableupload">
-
-
+
+
-
+
@@ -202,7 +202,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'Bomcx',
data() {
return {
optionsstats:[
@@ -245,14 +245,14 @@ export default {
tableColumn: [
{ type: 'checkbox', width: 50 },
{ type: 'seq', width: 60, title: '序号' },
- { field: 'zt', title: '状态', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'pid', title: 'pid', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
+ // { field: 'zt', title: '状态', width: 120,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
+ // { field: 'pid', title: 'pid', width: 120,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
{ field: 'dcch', title: '船号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -264,18 +264,18 @@ export default {
filterRender: { name: 'FilterCombination', },
},
- { field: 'sjch', title: '数据船号', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'lqbs', title: '板材领取标识', width: 120,
- filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
- filterRender: { name: 'FilterCombination', },
- },
- { field: 'tjbs', title: '板材统计标识', width: 120,
+ { field: 'sjch', title: '本船号', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
+ // { field: 'lqbs', title: '板材领取标识', width: 120,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
+ // { field: 'tjbs', title: '板材统计标识', width: 120,
+ // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+ // filterRender: { name: 'FilterCombination', },
+ // },
{ field: 'pl', title: '批量', width: 120,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@@ -296,12 +296,12 @@ export default {
filterRender: { name: 'FilterCombination', },
},
- { field: 'lqlb', title: '领取类别', width: 120,
+ { field: 'lqlb', title: '领取类别', width: 120,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'kw', title: '跨位', width: 120,
+ { field: 'kw', title: '跨位', width: 120,formatter: ['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -316,7 +316,7 @@ export default {
filterRender: { name: 'FilterCombination', },
},
- { field: 'zl', title: '组立', width: 120,
+ { field: 'zl', title: '组立', width: 120, formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
diff --git a/src/views/sjzx/bomwh.vue b/src/views/sjzx/bomwh.vue
index 14c60ff..7694c55 100644
--- a/src/views/sjzx/bomwh.vue
+++ b/src/views/sjzx/bomwh.vue
@@ -65,7 +65,6 @@
:on-change="handleChange"
:on-success="sucessChange"
:directory="true"
- :disabled="filedis"
:show-file-list="false"
>
选取文件夹
@@ -108,6 +107,7 @@
highlight-hover-row
show-overflow
show-header-overflow
+ :header-cell-style="headerCellStyle"
>
@@ -132,13 +132,13 @@
border
show-header-overflow
show-overflow
- :align="allAlign"
+ :align="center"
:data="tableupload">
-
+
@@ -245,7 +245,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'Bomwh',
data() {
return {
optionsstats:[
@@ -585,11 +585,11 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'bclq.dcPlZ', title: '批量', width: 100,editRender: { name: 'input' },
+ { field: 'bclq.dcPlZ', title: '批量', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'bclq.dcFdZ', title: '分段', width: 100, editRender: { name: 'input' },
+ { field: 'bclq.dcFdZ', title: '分段', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -623,20 +623,18 @@ export default {
},
- { field: 'bclq.dcZlZ', title: '组立', width: 100,editRender: { name: 'input' },
+ { field: 'bclq.dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'bclq.lqlbZ', title: '领取类别', width: 100,editRender: { name: 'input' },
+ { field: 'bclq.lqlbZ', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'bclq.zzcjZ', title: '加工跨', width: 100,editRender: { name: 'input' },
+ { field: 'bclq.zzcjZ', title: '加工跨', width: 100,formatter: ['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
-
-
{ field: 'bclq.wpgg', title: '规格', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
@@ -724,7 +722,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'tjb.ylzd1', title: '划线类型', width: 100,editRender: { name: 'input' },
+ { field: 'tjb.ylzd1', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX']
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -732,15 +730,15 @@ export default {
- { field: 'tjb.dcZl', title: '组立', width: 100,editRender: { name: 'input' },
+ { field: 'tjb.dcZl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'tjb.zzcj', title: '加工跨', width: 100,editRender: { name: 'input' },
+ { field: 'tjb.zzcj', title: '加工跨', width: 100,formatter: ['dictFormat','QGKW'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'tjb.sfyl', title: '余料', width: 100,editRender: { name: 'input' },
+ { field: 'tjb.sfyl', title: '余料', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -783,11 +781,11 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'tlt.dcZlZ', title: '组立', width: 100,
+ { field: 'tlt.dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'tlt.ylzd1Z', title: '划线类型', width: 100,
+ { field: 'tlt.ylzd1Z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -844,7 +842,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ljb.dcZl', title: '组立', width: 100,
+ { field: 'ljb.dcZl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
@@ -927,12 +925,12 @@ export default {
uploadExcel() {
- if (this.queryParam.cbbm === '') {
- this.$message.error('请选择船号！')
- return false;
- } else {
-
- }
+ // if (this.queryParam.cbbm === '') {
+ // this.$message.error('请选择船号！')
+ // return false;
+ // } else {
+ //
+ // }
// this.uploadData.czbh = this.queryParam.czbh
this.uploadData.isupload = this.isupload
@@ -947,11 +945,11 @@ export default {
// this.$message.error('请输入正确批量！')
// return false;
// }
- if (this.queryParam.cbbm === '') {
- this.filedis=true
- }else{
- this.filedis=false
- }
+ // if (this.queryParam.cbbm === '') {
+ // this.filedis=true
+ // }else{
+ // this.filedis=false
+ // }
},
handleAddFolder () {
@@ -964,13 +962,13 @@ export default {
// this.ljList=[],
this.tableupload=[],
this.$nextTick(() => {
- if (this.queryParam.dcch === ''|| this.queryParam.dcpl === '' ) {
- this.filedis=true
- this.$message.error('请输入正确船号 批量！')
- }else{
+ // if (this.queryParam.dcch === ''|| this.queryParam.dcpl === '' ) {
+ // this.filedis=true
+ // this.$message.error('请输入正确船号 批量！')
+ // }else{
this.filedis=false
this.$refs.upload.$children[0].$refs.input.webkitdirectory = true
- }
+ // }
@@ -1047,6 +1045,8 @@ export default {
//return( a[age] - b[age])
return( a.sort - b.sort)
})
+ this.queryParam.dcch=this.czbhu
+ this.queryParam.dcpl=this.phu
this.dialogVisible=true;
},
// 删除文件之前的钩子，参数为上传的文件和文件列表，若返回 false 或者返回 Promise 且被 reject，则停止删除。function(file, fileList)
@@ -1075,6 +1075,8 @@ export default {
formData.append('isupload', '01')
uploadBom(formData).then(res=>{
if (res.data.zt == "01") {
+ this.dialogVisible=false;
+ this.tableData=res.data.data;
this.$message.success('上传成功');
} else if (res.data.zt == "02") { //重新导入
this.$alert('该批量已导入数据,是否重新导入并覆盖该批量数据?', '提示', {
@@ -1169,7 +1171,115 @@ export default {
})
- }
+ },
+ headerCellStyle ({ column, columnIndex }) {
+ if ([ 'bclq.lqbh',
+ 'bclq.xh',
+ 'bclq.dcChZ',
+ 'bclq.dcPlZ',
+ 'bclq.dcFdZ',
+ 'bclq.qpyldZ',
+ 'bclq.ybzsZ',
+ 'bclq.lqzlZ',
+ 'bclq.shzlZ',
+ 'bclq.ylzlZ',
+ 'bclq.dcZlZ',
+ 'bclq.lqlbZ',
+ 'bclq.zzcjZ',
+ 'bclq.wpgg',
+ 'bclq.wpxh',
+ 'bclq.sl',
+ 'bclq.lqzl',
+ 'bclq.shzl',
+ 'bclq.ylzl',
+ 'bclq.qpyld',
+ 'bclq.ljzl',
+ 'bclq.dztlzl',
+ 'bclq.tlshbl',
+ 'bclq.derqZ',
+ 'bclq.zdrZ',
+ 'bclq.zdrqZ',
+ ].includes(column.property)) {
+ return {
+ backgroundColor: '#2db7f5',
+ color: '#ffffff'
+ }
+ }
+ if ([ 'tjb.dcCh',
+
+ 'tjb.dcPl',
+
+ 'tjb.ylzd1',
+
+
+
+
+
+ 'tjb.dcZl',
+
+ 'tjb.zzcj',
+
+ 'tjb.sfyl',
+
+ 'tjb.tzbh',
+
+
+ 'tjb.wpgg',
+
+
+ 'tjb.sl',
+
+
+ 'tjb.wpxh',
+
+ 'tjb.ylbh',
+
+
+ 'tjb.ylgg',
+
+ ].includes(column.property)) {
+ return {
+ backgroundColor: '#ff9966',
+ color: '#ffffff'
+ }
+ }
+ if ([ 'tlt.dcChZ',
+
+ 'tlt.dcPlZ',
+
+ 'tlt.dcZlZ',
+
+ 'tlt.ylzd1Z',
+
+
+ 'tlt.wpggZ',
+
+
+ 'tlt.wpxhZ',
+
+
+ 'tlt.hxcdZ',
+
+
+ 'tlt.ylzd4Z',
+
+ 'tlt.tzbhZ',
+
+
+ 'tlt.ljslZ',
+
+ 'tlt.xgr',
+
+ 'tlt.xgrq',
+
+
+ ].includes(column.property)) {
+ return {
+ backgroundColor: '#FFFF66',
+ color: '#ffffff'
+ }
+ }
+ },
}
}
diff --git a/src/views/sjzx/czbhcx.vue b/src/views/sjzx/czbhcx.vue
index 2a30d1d..b70dd78 100644
--- a/src/views/sjzx/czbhcx.vue
+++ b/src/views/sjzx/czbhcx.vue
@@ -99,7 +99,7 @@ import { mapGetters } from 'vuex'
import XEUtils from 'xe-utils'
import {null2str} from "@/utils/rpkj";
export default {
- name:'czbhwh',
+ name:'czbhcx',
data() {
return {
request: {
diff --git a/src/views/sjzx/ljptCX.vue b/src/views/sjzx/ljptCX.vue
index b75cdc4..7937c72 100644
--- a/src/views/sjzx/ljptCX.vue
+++ b/src/views/sjzx/ljptCX.vue
@@ -116,7 +116,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'LjptCX',
data() {
return {
queryParam: {
@@ -153,7 +153,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dcZl', title: '组立', width: 100,
+ { field: 'dcZl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
diff --git a/src/views/sjzx/plbXC.vue b/src/views/sjzx/plbXC.vue
index fd8d367..e9f4160 100644
--- a/src/views/sjzx/plbXC.vue
+++ b/src/views/sjzx/plbXC.vue
@@ -116,7 +116,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'PlbXC',
data() {
return {
queryParam: {
diff --git a/src/views/sjzx/xclqCX.vue b/src/views/sjzx/xclqCX.vue
index a146280..0d55809 100644
--- a/src/views/sjzx/xclqCX.vue
+++ b/src/views/sjzx/xclqCX.vue
@@ -116,7 +116,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'XclqCX',
data() {
return {
queryParam: {
@@ -156,7 +156,7 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dcZlZ', title: '组立', width: 100,
+ { field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
diff --git a/src/views/sjzx/xctltCX.vue b/src/views/sjzx/xctltCX.vue
index 4592328..ea1e73b 100644
--- a/src/views/sjzx/xctltCX.vue
+++ b/src/views/sjzx/xctltCX.vue
@@ -116,7 +116,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'XctltCX',
data() {
return {
queryParam: {
@@ -149,11 +149,11 @@ export default {
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'dcZlZ', title: '组立', width: 100,
+ { field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
- { field: 'ylzd1Z', title: '划线类型', width: 100,
+ { field: 'ylzd1Z', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX']
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},
diff --git a/src/views/sjzx/xcylCX.vue b/src/views/sjzx/xcylCX.vue
index 948a403..f32c162 100644
--- a/src/views/sjzx/xcylCX.vue
+++ b/src/views/sjzx/xcylCX.vue
@@ -116,7 +116,7 @@ import { getToken } from '@/utils/auth'
import { startLoading, endLoading } from '@/utils'
import { Message } from 'element-ui'
export default {
- name:'czplwh',
+ name:'XcylCX',
data() {
return {
queryParam: {
@@ -161,7 +161,7 @@ export default {
- { field: 'dcZl', title: '组立', width: 100,editRender: { name: 'input' },
+ { field: 'dcZl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', },
},