diff --git a/common/style/layout.styl b/common/style/layout.styl index b56584a..a94b911 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -189,6 +189,11 @@ uni-button:after { z-index: 101; box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20); } +.slide_new table th .td_3, .slide_new table td.td_3 { + width: 110px; + line-height: 28rpx; + white-space: unset; +} .slide_new table th.fontcol1,.slide_new table td.fontcol1 { color: #4e6ef2; font-weight: bold; diff --git a/pages/manage/bake-process.vue b/pages/manage/bake-process.vue index 5e2121c..3f3d7e2 100644 --- a/pages/manage/bake-process.vue +++ b/pages/manage/bake-process.vue @@ -4,38 +4,38 @@ - + 点位 - + - + 母卷号 - + - + 收卷辊码 - + - + 大/小卷 - + {{index1 !== '' ? options1[index1].text : ''}} @@ -43,51 +43,51 @@ - + 是否烘烤 - + - + 温度 - + - + 时间 - + - + 小时 - + 母卷号 - {{obj.container_name}} + {{obj.container_name}} - + 烘烤状态 - {{obj.status}} + {{obj.status}} - + 提示 - {{obj.tip}} + {{obj.tip}} diff --git a/pages/manage/raw-foil-progess.vue b/pages/manage/raw-foil-progess.vue index 29fc408..fc3c389 100644 --- a/pages/manage/raw-foil-progess.vue +++ b/pages/manage/raw-foil-progess.vue @@ -28,7 +28,9 @@ 母卷号 - + diff --git a/pages/manage/split-feed.vue b/pages/manage/split-feed.vue index 2e61806..ed3c801 100644 --- a/pages/manage/split-feed.vue +++ b/pages/manage/split-feed.vue @@ -22,7 +22,7 @@ 序号 - 母卷号 + 母卷号 机台编号 是否烘烤 烘烤时间/分 @@ -34,7 +34,7 @@ {{ i + 1 }} - {{e.container_name}} + {{e.container_name}} {{e.resource_name}} {{['否', '是'][Number(e.is_baking)]}} {{e.baking_time}} diff --git a/utils/mork2.js b/utils/mork2.js index de5e12f..ab9cf11 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -29,4 +29,10 @@ export const gxgetGxSpecification = () => { export const devicePointQuery = () => { let res = [{"text":"A1_FQ_01","value":"A10FQ00001"},{"text":"A1_FQ_02","value":"A10FQ00002"},{"text":"A1_FQ_03","value":"A10FQ00003"},{"text":"A1_FQ_04","value":null},{"text":"A1_FQ_05","value":null},{"text":"A1_FQ_06","value":null},{"text":"A1_FQ_07","value":null},{"text":"A1_FQ_08","value":null},{"text":"A1_FQ_09","value":null},{"text":"A1_FQ_10","value":null},{"text":"A1_FQ_11","value":null},{"text":"A1_FQ_12","value":null}] return res +} +export const queryOrderInfo = () => { + let res = { + data: [{container_name: 'R-A11ED00002-241206144453-A1_014_521 2', zc_point: 'zc_point'}] + } + return res } \ No newline at end of file